[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : phil
Repository : xara
Revision   : 1565
Date       : Thu Jul 27 10:30:44 BST 2006

Changed paths:
   M /Trunk/XaraLX/tools/texttool.cpp

MartinW's blank cursor patch in text tool


Diff:
Index: Trunk/XaraLX/tools/texttool.cpp
===================================================================
--- Trunk/XaraLX/tools/texttool.cpp	(revision 1564)
+++ Trunk/XaraLX/tools/texttool.cpp	(revision 1565)
@@ -140,6 +140,7 @@
 #include "nodepostpro.h"
 #include "nodepath.h"
 #include "usercord.h"
+#include "camview.h"
 
 DECLARE_SOURCE( "$Revision$" );
 
@@ -1188,12 +1189,23 @@
 					UnicodeValue = UnicodeManager::MultiByteToUnicode(UnicodeValue);
 #endif
 				
-				// Display a blank cursor (thus hiding the pointer)
+				// Display a blank cursor (thus hiding the pointer), but only if the pointer
+				// is over the current document window
 				if (!IsBlankCursorUp)
-				{
-					pcCurrentCursor = pcBlankCursor;
-					CursorStack::GSetTop(pcCurrentCursor, CurrentCursorID);
-					IsBlankCursorUp = TRUE;
+				{	
+					DocView* pDocView = DocView::GetSelected();
+					if (pDocView != NULL)
+					{
+						OilCoord DummyPos;
+						CCamView* pCCamView = pDocView->GetConnectionToOilView();
+						if (pCCamView && pCCamView->GetCurrentMousePos(&DummyPos))
+						{
+							// mouse is over document window
+							pcCurrentCursor = pcBlankCursor;
+							CursorStack::GSetTop(pcCurrentCursor, CurrentCursorID);
+							IsBlankCursorUp = TRUE;
+						}		
+					}
 				}
 				
 				// Create EditTextOp


Xara