r14999 by jghali - #9034: mouse pointer shape bugs after moving over guide

[scribus-commit]

Revision: 14999
Author: jghali
Date: 2010-04-22T19:56:16.623870Z
Commit message: #9034: mouse pointer shape bugs after moving over guide

Changeset: 
M  /branches/Version135/Scribus/scribus/canvasmode_normal.cpp

Diffs:
Index: scribus/canvasmode_normal.cpp
===================================================================
--- scribus/canvasmode_normal.cpp	(revision 14998)
+++ scribus/canvasmode_normal.cpp	(revision 14999)
@@ -255,7 +255,8 @@
 	if (commonMouseMove(m))
 		return;
 	m_mouseCurrentPoint = mousePointDoc;
-	if ((m_doc->guidesSettings.guidesShown) && (!m_doc->GuideLock) && (m_doc->OnPage(mousePointDoc.x(), mousePointDoc.y()) != -1) )
+	bool movingOrResizing = (m_canvas->m_viewMode.operItemMoving || m_canvas->m_viewMode.operItemResizing);
+	if ((m_doc->guidesSettings.guidesShown) && (!m_doc->GuideLock) && (!movingOrResizing) && (m_doc->OnPage(mousePointDoc.x(), mousePointDoc.y()) != -1) )
 	{
 		// #9002: Resize points undraggable when object is aligned to a guide
 		// Allow item resize when guides are aligned to item while preserving