r21188 by fschmid -

[scribus-commit]

Author: fschmid
Date: Wed Apr 13 19:50:35 2016
New Revision: 21188

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21188
Log:
Fixed Bug #9742: Changing the line spacing percentage does not change the line spacing

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    trunk/Scribus/scribus/prefsmanager.cpp
    trunk/Scribus/scribus/ui/prefs_typographybase.ui

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21188&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Wed Apr 13 19:50:35 2016
@@ -2002,7 +2002,7 @@
 						else if (style.lineSpacingMode() == ParagraphStyle::FixedLineSpacing)
 							current.yPos += (current.startOfCol ? 1 : style.lineSpacing());
 						else
-							current.yPos++;
+							current.yPos += (current.startOfCol ? 1 : style.lineSpacing());
 						lastLineY = maxYAsc;
 						if (current.startOfCol)
 						{
@@ -2080,7 +2080,7 @@
 				double diff = 0;
 				if (current.startOfCol || DropCmode)
 					diff = realAsce - (current.yPos - lastLineY);
-				else if (style.lineSpacingMode() != ParagraphStyle::FixedLineSpacing)
+				else if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
 				{
 					if (HasObject)
 						diff = (currentObject->height() + currentObject->lineWidth()) * scaleV + offset - (current.yPos - lastLineY);

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21188&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	Wed Apr 13 19:50:35 2016
@@ -2295,7 +2295,7 @@
 	doc->guidesPrefs().valueBaselineGrid      = attrs.valueAsDouble("BASEGRID", 12.0);
 	doc->guidesPrefs().offsetBaselineGrid     = attrs.valueAsDouble("BASEO", 0.0);
 	// #9621 : autolinespacing is now expressed as a percentage of the font height
-	doc->typographicPrefs().autoLineSpacing    = attrs.valueAsInt("AUTOL", 100, 500, 100);
+	doc->typographicPrefs().autoLineSpacing    = attrs.valueAsInt("AUTOL", 1, 500, 100);
 	doc->typographicPrefs().valueUnderlinePos  = attrs.valueAsInt("UnderlinePos", -1);
 	doc->typographicPrefs().valueUnderlineWidth  = attrs.valueAsInt("UnderlineWidth", -1);
 	doc->typographicPrefs().valueStrikeThruPos   = attrs.valueAsInt("StrikeThruPos", -1);

Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21188&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp	(original)
+++ trunk/Scribus/scribus/prefsmanager.cpp	Wed Apr 13 19:50:35 2016
@@ -2119,7 +2119,7 @@
 			appPrefs.typoPrefs.valueSubScript = dc.attribute("SubScriptDistance").toInt();
 			appPrefs.typoPrefs.scalingSubScript = dc.attribute("SubScriptScaling").toInt();
 			appPrefs.typoPrefs.valueSmallCaps  = dc.attribute("SmallCapsScaling").toInt();
-			appPrefs.typoPrefs.autoLineSpacing = dc.valueAsInt("AutomaticLineSpacing", 100, 500, 100);
+			appPrefs.typoPrefs.autoLineSpacing = dc.valueAsInt("AutomaticLineSpacing", 1, 500, 100);
 			double ulp = ScCLocale::toDoubleC(dc.attribute("UnderlineDistance"), -1.0);
 			if (ulp != -1)
 				appPrefs.typoPrefs.valueUnderlinePos = qRound(ulp * 10);

Modified: trunk/Scribus/scribus/ui/prefs_typographybase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21188&path=/trunk/Scribus/scribus/ui/prefs_typographybase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_typographybase.ui	(original)
+++ trunk/Scribus/scribus/ui/prefs_typographybase.ui	Wed Apr 13 19:50:35 2016
@@ -45,8 +45,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>639</width>
-        <height>782</height>
+        <width>648</width>
+        <height>624</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
@@ -516,7 +516,7 @@
             <string> %</string>
            </property>
            <property name="minimum">
-            <number>100</number>
+            <number>1</number>
            </property>
            <property name="maximum">
             <number>500</number>