Author: craig
Date: Mon May 4 17:09:29 2015
New Revision: 20051
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20051
Log:
#13042: Fix maximum display DPI to 500 to allow for current 4k, 5k, and future screens
Modified:
trunk/Scribus/scribus/ui/prefs_display.cpp
trunk/Scribus/scribus/ui/prefs_displaybase.ui
Modified: trunk/Scribus/scribus/ui/prefs_display.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20051&path=/trunk/Scribus/scribus/ui/prefs_display.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_display.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_display.cpp Mon May 4 17:09:29 2015
@@ -262,7 +262,7 @@
{
disconnect(adjustDisplaySlider, SIGNAL(valueChanged(int)), this, SLOT(setDisScale()));
int dpi = qApp->desktop()->logicalDpiX();
- if ((dpi < 60) || (dpi > 250))
+ if ((dpi < 60) || (dpi > 500))
dpi = 72;
displayScale = dpi / 72.0;
adjustDisplaySlider->setValue(qRound(100 * displayScale) - 150);
Modified: trunk/Scribus/scribus/ui/prefs_displaybase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20051&path=/trunk/Scribus/scribus/ui/prefs_displaybase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_displaybase.ui (original)
+++ trunk/Scribus/scribus/ui/prefs_displaybase.ui Mon May 4 17:09:29 2015
@@ -281,7 +281,7 @@
<number>-150</number>
</property>
<property name="maximum">
- <number>150</number>
+ <number>500</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -375,8 +375,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>192</width>
- <height>339</height>
+ <width>246</width>
+ <height>350</height>
</rect>
</property>
<layout class="QFormLayout" name="formLayout_2">