r23964 by jghali - Fix wrong cursor being sometime used after releasing keyboard key in Magnifier mode

[scribus-commit]

Author: jghali
Date: Wed Jul 29 23:43:49 2020
New Revision: 23964

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23964
Log:
Fix wrong cursor being sometime used after releasing keyboard key in Magnifier mode

Modified:
    trunk/Scribus/scribus/canvasmode.cpp
    trunk/Scribus/scribus/canvasmode_magnifier.cpp
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/canvasmode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23964&path=/trunk/Scribus/scribus/canvasmode.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode.cpp	Wed Jul 29 23:43:49 2020
@@ -1537,7 +1537,7 @@
 	//Exit out of panning mode if Control is release while the right mouse button is pressed
 	if ((m_doc->appMode == modePanning) && (e->key() == Qt::Key_Control) && (QApplication::mouseButtons() & Qt::RightButton))
 		m_view->requestMode(modeNormal);
-	if (m_doc->appMode == modeMagnifier)
+	if ((m_doc->appMode == modeMagnifier) && (e->key() == Qt::Key_Shift))
 		m_view->setCursor(IconManager::instance().loadCursor("lupez.png"));
 	if (e->isAutoRepeat() || !m_arrowKeyDown)
 		return;

Modified: trunk/Scribus/scribus/canvasmode_magnifier.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23964&path=/trunk/Scribus/scribus/canvasmode_magnifier.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_magnifier.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_magnifier.cpp	Wed Jul 29 23:43:49 2020
@@ -66,11 +66,9 @@
 		setModeCursor();
 }
 
-
 void CanvasMode_Magnifier::leaveEvent(QEvent *e)
 {
 }
-
 
 void CanvasMode_Magnifier::activate(bool fromGesture)
 {
@@ -105,7 +103,6 @@
 //	m_view->stopDragTimer();
 }
 
-
 void CanvasMode_Magnifier::mouseMoveEvent(QMouseEvent *m)
 {
 	const FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
@@ -171,8 +168,6 @@
 	m_SeRy = m_Myp;
 	m_view->redrawMarker->setGeometry(m->globalPos().x(), m->globalPos().y(), 1, 1);
 }
-
-
 
 void CanvasMode_Magnifier::mouseReleaseEvent(QMouseEvent *m)
 {

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23964&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Wed Jul 29 23:43:49 2020
@@ -1966,7 +1966,7 @@
 		if ((doc->appMode == modePanning) && (k->key() == Qt::Key_Control) && (QApplication::mouseButtons() & Qt::RightButton))
 			view->requestMode(modeNormal);
 
-		if (doc->appMode == modeMagnifier)
+		if ((doc->appMode == modeMagnifier) && (k->key() == Qt::Key_Shift))
 			view->setCursor(IconManager::instance().loadCursor("lupez.png"));
 	}
 	if (k->isAutoRepeat() || !m_arrowKeyDown)