r21536 by jghali - #14377: Rotate Item show wrong icon when mouse over frame middle point

scribus-commit scribus-commit at lists.scribus.net
Tue Nov 22 00:22:16 UTC 2016


Author: jghali
Date: Tue Nov 22 00:22:16 2016
New Revision: 21536

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21536
Log:
#14377: Rotate Item show wrong icon when mouse over frame middle point

Modified:
    branches/Version14x/Scribus/scribus/canvasmode_rotate.cpp

Modified: branches/Version14x/Scribus/scribus/canvasmode_rotate.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21536&path=/branches/Version14x/Scribus/scribus/canvasmode_rotate.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/canvasmode_rotate.cpp	(original)
+++ branches/Version14x/Scribus/scribus/canvasmode_rotate.cpp	Tue Nov 22 00:22:16 2016
@@ -381,7 +381,6 @@
 	m_angleConstrained = false;
 	
 	PageItem *currItem;
-	QRect tx;
 	m->accept();
 
 	if (GetItem(&currItem))
@@ -426,17 +425,9 @@
 				QRect mpo = QRect(m->x()-m_doc->guidesSettings.grabRad, m->y()-m_doc->guidesSettings.grabRad, m_doc->guidesSettings.grabRad*2, m_doc->guidesSettings.grabRad*2);
 				if ((QRegion(p.map(QPolygon(QRect(-3, -3, static_cast<int>(currItem->width()+6), static_cast<int>(currItem->height()+6))))).contains(mpo)))
 				{
-					tx = p.mapRect(QRect(0, 0, static_cast<int>(currItem->width()), static_cast<int>(currItem->height())));
+					QRect tx = p.mapRect(QRect(0, 0, static_cast<int>(currItem->width()), static_cast<int>(currItem->height())));
 					if ((tx.intersects(mpo)) && (!currItem->locked()))
-					{
 						m_view->setCursor(QCursor(loadIcon("Rotieren2.png")));
-						if (!currItem->sizeLocked())
-							m_view->HandleCurs(currItem, mpo);
-					}
-				}
-				else
-				{
-//					setModeCursor();
 				}
 			}
 		}




More information about the scribus-commit mailing list