[meld] gutterrendererchunk: Fix gutter actions for middle-to-right conflicts



commit 3649d8106c9c7b3b17c79c83b26c4a903a4ff260
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Tue Jul 21 05:54:11 2015 +1000

    gutterrendererchunk: Fix gutter actions for middle-to-right conflicts
    
    In conflict chunks, we were getting the wrong chunk line offsets when
    interacting with the right-hand pane.

 meld/gutterrendererchunk.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py
index cb91b39..871ab2b 100644
--- a/meld/gutterrendererchunk.py
+++ b/meld/gutterrendererchunk.py
@@ -72,8 +72,8 @@ class GutterRendererChunkAction(GtkSource.GutterRendererPixbuf):
         if chunk_index is None:
             return
 
-        # FIXME: This is all chunks, not just those shared with to_pane
-        chunk = self.linediffer.get_chunk(chunk_index, self.from_pane)
+        chunk = self.linediffer.get_chunk(
+            chunk_index, self.from_pane, self.to_pane)
         if chunk[1] != line:
             return
 


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