r17780 by jghali - #11101: fix incorrect image positioning when resizing image frame with fitImageToFrame set to "on"

[scribus-commit]

Author: jghali
Date: Fri Sep 28 11:27:10 2012
New Revision: 17780

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17780
Log:
#11101: fix incorrect image positioning when resizing image frame with fitImageToFrame set to "on"

Modified:
    trunk/Scribus/scribus/canvasgesture_resize.cpp

Modified: trunk/Scribus/scribus/canvasgesture_resize.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17780&path=/trunk/Scribus/scribus/canvasgesture_resize.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_resize.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_resize.cpp Fri Sep 28 11:27:10 2012
@@ -277,7 +277,7 @@
 			}
 			currItem->setImageXYScale(imgScX, imgScY);
 		}
-		else if (currItem->itemType() == PageItem::ImageFrame && currItem->PictureIsAvailable)
+		else if (currItem->itemType() == PageItem::ImageFrame && currItem->PictureIsAvailable && !currItem->fitImageToFrame())
 		{
 			QTransform mm = currItem->getTransform();
 			QPointF itPos = mm.map(QPointF(0, 0));