r19276 by jghali - #12408, redo part: Undo triggers a sudden magnification of an image with no possibility to undo

[scribus-commit]

Author: jghali
Date: Tue Jun 24 17:42:03 2014
New Revision: 19276

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19276
Log:
#12408, redo part: Undo triggers a sudden magnification of an image with no possibility to undo

Modified:
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem_imageframe.cpp

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19276&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Tue Jun 24 17:42:03 2014
@@ -7487,6 +7487,12 @@
 		Selection tempSelection(this, false);
 		tempSelection.addItem(this, true);
 		m_Doc->itemSelection_ClearItem(&tempSelection);
+		if (isUndo)
+		{
+			setImageFlippedH(is->getBool("FLIPPH"));
+			setImageFlippedV(is->getBool("FLIPPV"));
+			setImageScalingMode(is->getBool("SCALING"), is->getBool("ASPECT"));
+		}
 	}
 	else
 	{

Modified: trunk/Scribus/scribus/pageitem_imageframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19276&path=/trunk/Scribus/scribus/pageitem_imageframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_imageframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_imageframe.cpp Tue Jun 24 17:42:03 2014
@@ -241,8 +241,8 @@
 	setImageFlippedH(false);
 	setImageFlippedV(false);
 	EmProfile = "";
-	ScaleType = true;
-	AspectRatio = false;
+	ScaleType = m_Doc->prefsData().itemToolPrefs.imageScaleType;;
+	AspectRatio = m_Doc->prefsData().itemToolPrefs.imageAspectRatio;
 	setFillTransparency(0.0);
 	setLineTransparency(0.0);
 	imageClip.resize(0);