r21631 by jghali - #14445: Arabic single word wrongly justified to the left with "Forced Justified" alignment

[scribus-commit]

Author: jghali
Date: Sat Dec 10 16:07:38 2016
New Revision: 21631

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21631
Log:
#14445: Arabic single word wrongly justified to the left with "Forced 
Justified" alignment

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=21631&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp        (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp        Sat Dec 10 16:07:38 2016
@@ -2560,7 +2560,8 @@
                                                        OFs = 
current.line.width - current.line.naturalWidth;
                                                if (style.alignment() == 
ParagraphStyle::Centered)
                                                        OFs = 
(current.line.width - current.line.naturalWidth) / 2;
-                                               if (style.alignment() == 
ParagraphStyle::Justified)
+                                               if (style.alignment() == 
ParagraphStyle::Justified ||
+                                                       style.alignment() == 
ParagraphStyle::Extended)
                                                {
                                                        if (style.direction() 
== ParagraphStyle::RTL)
                                                                OFs = 
current.line.width - current.line.naturalWidth;
@@ -2917,7 +2918,8 @@
                                OFs = current.line.width - 
current.line.naturalWidth;
                        if (style.alignment() == ParagraphStyle::Centered)
                                OFs = (current.line.width - 
current.line.naturalWidth) / 2;
-                       if (style.alignment() == ParagraphStyle::Justified)
+                       if (style.alignment() == ParagraphStyle::Justified ||
+                               style.alignment() == ParagraphStyle::Extended)
                        {
                                if (style.direction() == ParagraphStyle::RTL)
                                        OFs = current.line.width - 
current.line.naturalWidth;


_______________________________________________
scribus-commit mailing list
scribus-commit@lists.scribus.net
http://lists.scribus.net/mailman/listinfo/scribus-commit