r16902 by fschmid - Better rendering in outline render mode for Symbols and Groups.

[scribus-commit]

Author: fschmid
Date: Thu Oct 13 19:59:41 2011
New Revision: 16902

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16902
Log:
Better rendering in outline render mode for Symbols and Groups.

Modified:
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem_group.cpp
    trunk/Scribus/scribus/pageitem_symbol.cpp

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16902&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Thu Oct 13 19:59:41 2011
@@ -1408,7 +1408,7 @@
 	DrawObj_Pre(p);
 	if (m_Doc->layerOutline(LayerID))
 	{
-		if ((itemType()==TextFrame || itemType()==ImageFrame || itemType()==PathText || itemType()==Line || itemType()==PolyLine /*|| itemType()==Group || itemType()==Symbol*/))
+		if ((itemType()==TextFrame || itemType()==ImageFrame || itemType()==PathText || itemType()==Line || itemType()==PolyLine || itemType()==Group || itemType()==Symbol))
 			DrawObj_Item(p, cullingArea);
 	}
 	else

Modified: trunk/Scribus/scribus/pageitem_group.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16902&path=/trunk/Scribus/scribus/pageitem_group.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_group.cpp (original)
+++ trunk/Scribus/scribus/pageitem_group.cpp Thu Oct 13 19:59:41 2011
@@ -211,6 +211,15 @@
 			}
 			p->endLayer();
 			p->restore();
+			if (m_Doc->layerOutline(LayerID))
+			{
+				p->setPen(m_Doc->layerMarker(LayerID), 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+				p->setFillMode(ScPainter::None);
+				p->setBrushOpacity(1.0);
+				p->setPenOpacity(1.0);
+				p->setupPolygon(&PoLine);
+				p->strokePath();
+			}
 			if (m_Doc->guidesPrefs().framesShown)
 			{
 				for (int em = 0; em < groupItemList.count(); ++em)

Modified: trunk/Scribus/scribus/pageitem_symbol.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16902&path=/trunk/Scribus/scribus/pageitem_symbol.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_symbol.cpp (original)
+++ trunk/Scribus/scribus/pageitem_symbol.cpp Thu Oct 13 19:59:41 2011
@@ -154,6 +154,15 @@
 			}
 			p->endLayer();
 			p->restore();
+			if (m_Doc->layerOutline(LayerID))
+			{
+				p->setPen(m_Doc->layerMarker(LayerID), 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+				p->setFillMode(ScPainter::None);
+				p->setBrushOpacity(1.0);
+				p->setPenOpacity(1.0);
+				p->setupPolygon(&PoLine);
+				p->strokePath();
+			}
 		}
 		else
 		{