[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : phil
Repository : xara
Revision   : 1451
Date       : Mon Jul 17 12:01:55 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/rulers.cpp

MartinW's fix for BZ1269


Diff:
Index: Trunk/XaraLX/Kernel/rulers.cpp
===================================================================
--- Trunk/XaraLX/Kernel/rulers.cpp	(revision 1450)
+++ Trunk/XaraLX/Kernel/rulers.cpp	(revision 1451)
@@ -190,7 +190,12 @@
 	UserCoord Offsets(0, 0);
 	if (Tool::GetCurrent())
 		Tool::GetCurrent()->GetRulerOrigin(pSpread, &Offsets);
-	UpdateRect.Translate(-Offsets.x, -Offsets.y);
+	// We translate the rectangle by the tool-supplied offsets. We do not call UserRect::Translate
+	// since our rectangle is not necessarily valid due to MakeCoord used in the limit checks above
+	UpdateRect.lo.x -= Offsets.x;
+	UpdateRect.lo.y -= Offsets.y;
+	UpdateRect.hi.x -= Offsets.x;
+	UpdateRect.hi.y -= Offsets.y;
 
 	// allow the current tool to render background blobs
 	if (Tool::GetCurrent())


Xara