Author: jghali
Date: Thu Jul 11 18:26:13 2013
New Revision: 18365
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18365
Log:
#11655: Inside X of adjust-to-frame images is not recorded
Modified:
trunk/Scribus/scribus/pageitem.cpp
Modified: trunk/Scribus/scribus/pageitem.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=18365&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Thu Jul 11 18:26:13 2013
@@ -9432,12 +9432,12 @@
return;
if (OrigW == 0 || OrigH == 0)
return;
-// LocalX = 0;
-// LocalY = 0;
-// LocalRot = 0;
double xs = m_width / static_cast<double>(OrigW);
double ys = m_height / static_cast<double>(OrigH);
- if (m_imageRotation != 0.0)
+ double imgXOffs = m_imageXOffset;
+ double imgYOffs = m_imageYOffset;
+ double imageRot = fmod(m_imageRotation, 360);
+ if (imageRot != 0.0)
{
QRectF br = QRectF(0, 0, OrigW, OrigH);
QTransform m;
@@ -9492,6 +9492,11 @@
LocalY = (Height - static_cast<double>(OrigH) *
LocalScY) / LocalScY;
break;
}*/
+ if (m_Doc && m_Doc->isLoading())
+ {
+ m_imageXOffset = imgXOffs;
+ m_imageYOffset = imgYOffs;
+ }
if (imageClip.size() != 0)
{
imageClip =
pixm.imgInfo.PDSpathData[pixm.imgInfo.usedPath].copy();
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
