r14424 by fschmid - Fixed some redraw issues with brushes.

[scribus-commit]

Revision: 14424
Author: fschmid
Date: 2009-12-17T05:47:48.763613Z
Commit message: Fixed some redraw issues with brushes.

Changeset: 
M  /trunk/Scribus/scribus/pageitem.cpp

Diffs:
Index: scribus/pageitem.cpp
===================================================================
--- scribus/pageitem.cpp	(revision 14423)
+++ scribus/pageitem.cpp	(revision 14424)
@@ -4988,6 +4988,13 @@
 	{
 		if ((lineColor() != CommonStrings::None) || (!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0))
 			extraSpace = m_lineWidth / 2.0;
+		if ((!patternStrokeVal.isEmpty()) && (m_Doc->docPatterns.contains(patternStrokeVal)) && (patternStrokePath))
+		{
+			ScPattern *pat = &m_Doc->docPatterns[patternStrokeVal];
+			double ww = (pat->width * patternStrokeScaleX / 100.0) / 2.0;
+			double hh = (pat->height * patternStrokeScaleY / 100.0) / 2.0;
+			extraSpace = qMax(ww, hh);
+		}
 	}
 	else
 	{
@@ -5139,6 +5146,13 @@
 	{
 		if ((lineColor() != CommonStrings::None) || (!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0))
 			extraSpace = m_lineWidth / 2.0;
+		if ((!patternStrokeVal.isEmpty()) && (m_Doc->docPatterns.contains(patternStrokeVal)) && (patternStrokePath))
+		{
+			ScPattern *pat = &m_Doc->docPatterns[patternStrokeVal];
+			double ww = (pat->width * patternStrokeScaleX / 100.0) / 2.0;
+			double hh = (pat->height * patternStrokeScaleY / 100.0) / 2.0;
+			extraSpace = qMax(ww, hh);
+		}
 	}
 	else
 	{
@@ -5157,6 +5171,13 @@
 	{
 		if ((lineColor() != CommonStrings::None) || (!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0))
 			extraSpace = m_lineWidth / 2.0;
+		if ((!patternStrokeVal.isEmpty()) && (m_Doc->docPatterns.contains(patternStrokeVal)) && (patternStrokePath))
+		{
+			ScPattern *pat = &m_Doc->docPatterns[patternStrokeVal];
+			double ww = (pat->width * patternStrokeScaleX / 100.0) / 2.0;
+			double hh = (pat->height * patternStrokeScaleY / 100.0) / 2.0;
+			extraSpace = qMax(ww, hh);
+		}
 	}
 	else
 	{
@@ -5175,6 +5196,13 @@
 	{
 		if ((lineColor() != CommonStrings::None) || (!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0))
 			extraSpace = m_lineWidth;
+		if ((!patternStrokeVal.isEmpty()) && (m_Doc->docPatterns.contains(patternStrokeVal)) && (patternStrokePath))
+		{
+			ScPattern *pat = &m_Doc->docPatterns[patternStrokeVal];
+			double ww = (pat->width * patternStrokeScaleX / 100.0) / 2.0;
+			double hh = (pat->height * patternStrokeScaleY / 100.0) / 2.0;
+			extraSpace = qMax(ww, hh);
+		}
 	}
 	else
 	{
@@ -5193,6 +5221,13 @@
 	{
 		if ((lineColor() != CommonStrings::None) || (!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0))
 			extraSpace = m_lineWidth;
+		if ((!patternStrokeVal.isEmpty()) && (m_Doc->docPatterns.contains(patternStrokeVal)) && (patternStrokePath))
+		{
+			ScPattern *pat = &m_Doc->docPatterns[patternStrokeVal];
+			double ww = (pat->width * patternStrokeScaleX / 100.0) / 2.0;
+			double hh = (pat->height * patternStrokeScaleY / 100.0) / 2.0;
+			extraSpace = qMax(ww, hh);
+		}
 	}
 	else
 	{