r19129 by jghali - fix typo in previous commit
scribus-commit
scribus-commit at lists.scribus.net
Tue May 20 18:34:21 UTC 2014
Author: jghali
Date: Tue May 20 18:34:21 2014
New Revision: 19129
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19129
Log:
fix typo in previous commit
Modified:
trunk/Scribus/scribus/canvasgesture_resize.cpp
Modified: trunk/Scribus/scribus/canvasgesture_resize.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19129&path=/trunk/Scribus/scribus/canvasgesture_resize.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_resize.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_resize.cpp Tue May 20 18:34:21 2014
@@ -215,7 +215,7 @@
continue;
QTransform m;
m.translate(localRect.x(), localRect.y());
- m.translate((currItem->xPos() - x) * scy, (currItem->yPos() - y) * scy);
+ m.translate((currItem->xPos() - x) * scx, (currItem->yPos() - y) * scy);
m.scale(scx, scy);
if (currItem->rotation() != 0)
m.rotate(currItem->rotation());
@@ -415,6 +415,20 @@
currItem->setWidth(newBounds.width() / m_scaleX - m_extraWidth);
currItem->setHeight(newBounds.height() / m_scaleY - m_extraHeight);
+ /*QTransform mm1 = currItem->getTransform();
+ QTransform mm2 = mm1.inverted();
+ QPointF itPos = mm1.map(QPointF(0, 0));
+ double m_scaleX, m_scaleY;
+ getScaleFromMatrix(mm1, m_scaleX, m_scaleY);
+ QPointF newPos = mm2.map(itPos) - mm2.map(newBounds.topLeft());*/
+ /*if (currItem->imageFlippedH())
+ dx *= -1;
+ if (currItem->imageFlippedV())
+ dy *= -1;*/
+ /*currItem->moveBy(-newPos.x(), -newPos.y(), true);
+ currItem->setWidth(newBounds.width() / m_scaleX - m_extraWidth);
+ currItem->setHeight(newBounds.height() / m_scaleY - m_extraHeight);*/
+
switch (m_handle)
{
case Canvas::NORTH:
More information about the scribus-commit
mailing list