[meld] Fix linkmap drawing when scrolling panes individually



commit 4f0321a2325c0ad379735e85d37144c410d29ade
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Mon Aug 31 09:10:19 2009 +1000

    Fix linkmap drawing when scrolling panes individually

 meld/filediff.py |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index a2a1e9e..93ddd2c 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -964,7 +964,10 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
 
     def _sync_vscroll(self, adjustment):
         # only allow one scrollbar to be here at a time
-        if (self.keymask & MASK_SHIFT)==0 and not self._sync_vscroll_lock:
+        if self._sync_vscroll_lock:
+            return
+
+        if (self.keymask & MASK_SHIFT) == 0:
             self._sync_vscroll_lock = True
             syncpoint = 0.5
 
@@ -1012,12 +1015,13 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
                 if master != 1:
                     line = other_line
                     master = 1
-            for lm in self.linkmap:
-                if lm.window:
-                    lm.window.invalidate_rect(None, True)
-                    lm.window.process_updates(True)
             self._sync_vscroll_lock = False
 
+        for lm in self.linkmap:
+            if lm.window:
+                lm.window.invalidate_rect(None, True)
+                lm.window.process_updates(True)
+
         #
         # scrollbar drawing
         #



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]