r16236 by fschmid - Fixed Bug #9660: "Ungrouping of scaled of groups is not correct"

[scribus-commit]

Author: fschmid
Date: Sun Jan  9 22:42:25 2011
New Revision: 16236

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16236
Log:
Fixed Bug #9660: "Ungrouping of scaled of groups is not correct"

Modified:
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/scribusdoc.h

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16236&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Sun Jan  9 22:42:25 2011
@@ -11385,7 +11385,7 @@
 }
 
 
-void ScribusDoc::AdjustItemSize(PageItem *currItem, bool includeGroup)
+void ScribusDoc::AdjustItemSize(PageItem *currItem, bool includeGroup, bool moveInGroup)
 {
 	bool siz = currItem->Sizing;
 	currItem->Sizing = false;
@@ -11414,7 +11414,7 @@
 			currItem->moveImageInFrame(0, (currItem->height() - tp.y())/currItem->imageYScale());
 		SizeItem(tp.x(), tp.y(), currItem, true, false);
 		currItem->PoLine = Clip.copy();
-		if (currItem->isGroup() && includeGroup)
+		if (currItem->isGroup() && includeGroup && moveInGroup)
 		{
 			for (int em = 0; em < currItem->groupItemList.count(); ++em)
 			{
@@ -11587,7 +11587,7 @@
 			bb->PoLine.map(ma2);
 			bb->setRotation(0.0);
 			bb->ClipEdited = true;
-			AdjustItemSize(bb);
+			AdjustItemSize(bb, true, false);
 			QTransform ma3;
 			ma3.translate(gx, gy);
 			ma3.scale(scx, scy);
@@ -11601,7 +11601,7 @@
 				QTransform ma;
 				ma.rotate(-bb->rotation());
 				bb->PoLine.map(ma);
-				AdjustItemSize(bb);
+				AdjustItemSize(bb, true, false);
 			}
 		}
 		if (scaleText)

Modified: trunk/Scribus/scribus/scribusdoc.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16236&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h (original)
+++ trunk/Scribus/scribus/scribusdoc.h Sun Jan  9 22:42:25 2011
@@ -1008,7 +1008,7 @@
 	bool SizeItem(double newX, double newY, PageItem *pi, bool fromMP = false, bool DoUpdateClip = true, bool redraw = true);
 	bool MoveSizeItem(FPoint newX, FPoint newY, int ite, bool fromMP = false, bool constrainRotation=false);
 	bool MoveSizeItem(FPoint newX, FPoint newY, PageItem* currItem, bool fromMP = false, bool constrainRotation = false);
-	void AdjustItemSize(PageItem *currItem, bool includeGroup = false);
+	void AdjustItemSize(PageItem *currItem, bool includeGroup = false, bool moveInGroup = true);
 	void moveGroup(double x, double y, bool fromMP = false, Selection* customSelection = 0);
 	void rotateGroup(double angle, FPoint RCenter);
 	void scaleGroup(double scx, double scy, bool scaleText=true, Selection* customSelection = 0, bool scaleLine = false);