r21276 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Mon May 2 21:28:18 UTC 2016


Author: jghali
Date: Mon May  2 21:28:17 2016
New Revision: 21276

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21276
Log:
fix Windows printing regression: curve not printed when "display curve" option is enabled for path text objects

Modified:
    trunk/Scribus/scribus/scpageoutput.cpp

Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21276&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp	(original)
+++ trunk/Scribus/scribus/scpageoutput.cpp	Mon May  2 21:28:17 2016
@@ -1097,6 +1097,32 @@
 
 void ScPageOutput::drawItem_PathText( PageItem_PathText* item, ScPainterExBase* painter, QRect clip )
 {
+	if (item->pathTextShowFrame())
+	{
+		painter->setupPolygon(&item->PoLine, false);
+		if (item->NamedLStyle.isEmpty())
+		{
+			if (item->lineColor() != CommonStrings::None)
+				painter->strokePath();
+		}
+		else
+		{
+			multiLine ml = m_doc->MLineStyles[item->NamedLStyle];
+			for (int it = ml.size() - 1; it > -1; it--)
+			{
+				const SingleLine& sl = ml[it];
+				if ((sl.Color != CommonStrings::None) && (sl.Width != 0))
+				{
+					ScColorShade tmp(m_doc->PageColors[sl.Color], sl.Shade);
+					painter->setPen(tmp, sl.Width,  static_cast<Qt::PenStyle>(sl.Dash), 
+							 static_cast<Qt::PenCapStyle>(sl.LineEnd), 
+							 static_cast<Qt::PenJoinStyle>(sl.LineJoin));
+					painter->drawLine(FPoint(0, 0), FPoint(item->width(), 0));
+				}
+			}
+		}
+	}
+
 	ScPageOutputPainter p(item, painter, this);
 	item->textLayout.renderBackground(&p);
 	item->textLayout.render(&p);




More information about the scribus-commit mailing list