r20119 by fschmid - Fixed Bug #12448: Resizing of a Group + Item is not correct

scribus-commit scribus-commit at lists.scribus.net
Sat May 23 09:02:20 UTC 2015


Author: fschmid
Date: Sat May 23 09:02:20 2015
New Revision: 20119

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20119
Log:
Fixed Bug #12448: Resizing of a Group + Item is not correct

Modified:
    trunk/Scribus/scribus/scribusdoc.cpp

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20119&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Sat May 23 09:02:20 2015
@@ -14875,6 +14875,14 @@
 				PageItem_Spiral* item = bb->asSpiral();
 				item->recalcPath();
 			}
+			else if (bb->isGroup() || bb->isSymbol())
+			{
+				double oldGW = bb->groupWidth;
+				double oldGH = bb->groupHeight;
+				AdjustItemSize(bb, true, false);
+				bb->groupWidth = oldGW;
+				bb->groupHeight = oldGH;
+			}
 			else
 				AdjustItemSize(bb, true, false);
 			QTransform ma3;
@@ -14891,7 +14899,16 @@
 				QTransform ma;
 				ma.rotate(-bb->rotation());
 				bb->PoLine.map(ma);
-				AdjustItemSize(bb, true, false);
+				if (bb->isGroup() || bb->isSymbol())
+				{
+					double oldGW = bb->groupWidth;
+					double oldGH = bb->groupHeight;
+					AdjustItemSize(bb, true, false);
+					bb->groupWidth = oldGW;
+					bb->groupHeight = oldGH;
+				}
+				else
+					AdjustItemSize(bb, true, false);
 			}
 		}
 		if (scaleText)




More information about the scribus-commit mailing list