r21106 by fschmid -

[scribus-commit]

Author: fschmid
Date: Tue Mar 22 18:58:27 2016
New Revision: 21106

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21106
Log:
Improved drawing of object decorations (Contourline etc...)

Modified:
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21106&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Tue Mar 22 18:58:27 2016
@@ -2086,7 +2086,7 @@
 void PageItem::DrawObj_Decoration(ScPainter *p)
 {
 	p->save();
-	p->setAntialiasing(false);
+//	p->setAntialiasing(false);
 	if (!isEmbedded)
 		p->translate(m_xPos, m_yPos);
 	p->rotate(m_rotation);
@@ -2189,7 +2189,7 @@
 		//	drawLockedMarker(p);
 	}
 	FrameOnly = false;
-	p->setAntialiasing(true);
+//	p->setAntialiasing(true);
 	p->restore();
 }
 

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21106&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Tue Mar 22 18:58:27 2016
@@ -4135,7 +4135,7 @@
 	//#12405 if (isAnnotation() && ((annotation().Type() > 1) && (annotation().Type() < 7)) && (annotation().Bwid() > 0))
 	//	return;
 	p->save();
-	p->setAntialiasing(false);
+//	p->setAntialiasing(false);
 	if (!isEmbedded)
 		p->translate(m_xPos, m_yPos);
 	p->rotate(m_rotation);
@@ -4158,7 +4158,7 @@
 		}
 		if ((m_Doc->guidesPrefs().framesShown) && textFlowUsesContourLine() && (ContourLine.size() != 0))
 		{
-			p->setPen(Qt::lightGray, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+			p->setPen(Qt::darkGray, 0, Qt::DotLine, Qt::FlatCap, Qt::MiterJoin);
 			p->setupSharpPolygon(&ContourLine);
 			p->strokePath();
 		}
@@ -4200,7 +4200,7 @@
 		//	drawLockedMarker(p);
 	}
 	FrameOnly = false;
-	p->setAntialiasing(true);
+//	p->setAntialiasing(true);
 	p->restore();
 }