r16748 by fschmid - Better fix for Bug 10144: "Shapes are sometimes cut off after grouping

[scribus-commit]

Author: fschmid
Date: Tue Aug  2 22:46:49 2011
New Revision: 16748

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16748
Log:
Better fix for Bug 10144: "Shapes are sometimes cut off after grouping

Modified:
    trunk/Scribus/scribus/pageitem.cpp

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16748&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Tue Aug  2 22:46:49 2011
@@ -5364,8 +5364,13 @@
 	double extraSpace = 0.0;
 	if (NamedLStyle.isEmpty())
 	{
-		if (((lineColor() != CommonStrings::None) || (!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0)) && (PLineEnd != Qt::FlatCap))
-			extraSpace = m_lineWidth / 2.0;
+		if ((lineColor() != CommonStrings::None) || (!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0))
+		{
+			if (isLine() && (PLineEnd == Qt::FlatCap))
+				extraSpace = 0.0;
+			else
+				extraSpace = m_lineWidth / 2.0;
+		}
 		if ((!patternStrokeVal.isEmpty()) && (m_Doc->docPatterns.contains(patternStrokeVal)) && (patternStrokePath))
 		{
 			ScPattern *pat = &m_Doc->docPatterns[patternStrokeVal];