r21748 by jghali - fix issue preventing drawing of item snap lines when resizing object

scribus-commit scribus-commit at lists.scribus.net
Fri Jan 27 16:53:09 UTC 2017


Author: jghali
Date: Fri Jan 27 16:53:09 2017
New Revision: 21748

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21748
Log:
fix issue preventing drawing of item snap lines when resizing object

Modified:
    trunk/Scribus/scribus/canvasgesture_resize.cpp

Modified: trunk/Scribus/scribus/canvasgesture_resize.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21748&path=/trunk/Scribus/scribus/canvasgesture_resize.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_resize.cpp	(original)
+++ trunk/Scribus/scribus/canvasgesture_resize.cpp	Fri Jan 27 16:53:09 2017
@@ -484,13 +484,13 @@
 		|| m_handle == Canvas::SOUTHWEST || m_handle == Canvas::SOUTHEAST;
 	if (m_rotation == 0 || isCorner)
 	{
-		FPoint snappedPoint = applyGrid(docPoint);
-		snappedPoint = applyGuides(snappedPoint);
-
-		double x = snappedPoint.x(), y = snappedPoint.y();
-		if (x != snappedPoint.x() && m_handle != Canvas::NORTH && m_handle != Canvas::SOUTH)
+		FPoint snappedPoint1 = applyGrid(docPoint);
+		FPoint snappedPoint2 = applyGuides(snappedPoint1);
+
+		double x = snappedPoint2.x(), y = snappedPoint2.y();
+		if (x != snappedPoint1.x() && m_handle != Canvas::NORTH && m_handle != Canvas::SOUTH)
 			xSnap = x;
-		if (y != snappedPoint.y() && m_handle != Canvas::EAST && m_handle != Canvas::WEST)
+		if (y != snappedPoint1.y() && m_handle != Canvas::EAST && m_handle != Canvas::WEST)
 			ySnap = y;
 //		if (m_doc->ApplyGuides(&x, &y))
 //			qDebug() << "guides applied:" << snappedPoint.x() << snappedPoint.y() << "to" << x << y;




More information about the scribus-commit mailing list