# HG changeset patch
# User Laurent Bessard
# Date 1372929484 -7200
# Node ID 921858d68a1363ea7f4d6344a7a9ebad26ecbcc9
# Parent  0086cbee609bd50d14d11b7f675dbcb99ad7b3b3
Fix refresh bug when scrolling Viewer while dragging graphic element or rubberband

diff -r 0086cbee609b -r 921858d68a13 editors/Viewer.py
--- a/editors/Viewer.py	Wed Jul 03 11:08:09 2013 +0200
+++ b/editors/Viewer.py	Thu Jul 04 11:18:04 2013 +0200
@@ -1809,6 +1809,7 @@
     
     def OnViewerLeftDown(self, event):
         self.Editor.CaptureMouse()
+        self.StartMousePos = event.GetPosition()
         if self.Mode == MODE_SELECTION:
             dc = self.GetLogicalDC()
             pos = event.GetLogicalPosition(dc)
@@ -1892,7 +1893,6 @@
                     if element is not None:
                         self.SelectedElement = element
                         if self.Debug:
-                            self.StartMousePos = event.GetPosition()
                             Graphic_Element.OnLeftDown(self.SelectedElement, event, dc, self.Scaling)
                         else:
                             self.SelectedElement.OnLeftDown(event, dc, self.Scaling)
@@ -1906,7 +1906,6 @@
             self.rubberBand.Reset()
             self.rubberBand.OnLeftDown(event, self.GetLogicalDC(), self.Scaling)
         elif self.Mode == MODE_MOTION:
-            self.StartMousePos = event.GetPosition()
             self.StartScreenPos = self.GetScrollPos(wx.HORIZONTAL), self.GetScrollPos(wx.VERTICAL)
         event.Skip()
 
@@ -2050,7 +2049,6 @@
                     self.SelectedElement.OnLeftUp(event, dc, self.Scaling)
                 wx.CallAfter(self.SetCurrentCursor, 0)
         elif self.Mode == MODE_MOTION:
-            self.StartMousePos = None
             self.StartScreenPos = None
         if self.Mode != MODE_SELECTION and not self.SavedMode:
             wx.CallAfter(self.ParentWindow.ResetCurrentMode)
@@ -2245,8 +2243,6 @@
         event.Skip()
 
     def OnLeaveViewer(self, event):
-        if self.StartScreenPos is None:
-            self.StartMousePos = None
         if self.SelectedElement is not None and self.SelectedElement.GetDragging():
             event.Skip()
         elif self.HighlightedElement is not None:
@@ -3417,7 +3413,7 @@
 #-------------------------------------------------------------------------------
 
     def OnScrollWindow(self, event):
-        if self.Editor.HasCapture() and self.StartMousePos:
+        if self.Editor.HasCapture() and self.StartMousePos is not None:
             return
         if wx.Platform == '__WXMSW__':
             wx.CallAfter(self.RefreshVisibleElements)
diff -r 0086cbee609b -r 921858d68a13 graphics/RubberBand.py
--- a/graphics/RubberBand.py	Wed Jul 03 11:08:09 2013 +0200
+++ b/graphics/RubberBand.py	Thu Jul 04 11:18:04 2013 +0200
@@ -164,6 +164,8 @@
                     bbox.x * scalex, bbox.y * scaley, 
                     bbox.width * scalex, bbox.height * scaley)
         
+        dc.SetLogicalFunction(wx.COPY)
+        
         # Restore Viewer scale factor
         dc.SetUserScale(scalex, scaley)