Allow customization of current chunk highlight colour (bgo#701574)

Author: Louis des Landes

data/gtkrc

@@ -29,6 +29,8 @@ style "meld-color-scheme"
     color["current-line-highlight"] = "#ffff00"
 
     color["syncpoint-outline"] = "#555555"
+
+    color["current-chunk-highlight"] = "#ffffff"
 }
 widget "meldapp.*" style : lowest "meld-color-scheme"
 

meld/filediff.py

@@ -352,7 +352,9 @@ def on_style_set(self, widget, prev_style):
         self.fill_colors = {"insert"  : lookup("insert-bg", "DarkSeaGreen1"),
                             "delete"  : lookup("insert-bg", "DarkSeaGreen1"),
                             "conflict": lookup("conflict-bg", "Pink"),
-                            "replace" : lookup("replace-bg", "#ddeeff")}
+                            "replace" : lookup("replace-bg", "#ddeeff"),
+                            "current-chunk-highlight":
+                                lookup("current-chunk-highlight", '#ffffff')}
         self.line_colors = {"insert"  : lookup("insert-outline", "#77f077"),
                             "delete"  : lookup("insert-outline", "#77f077"),
                             "conflict": lookup("conflict-outline", "#f0768b"),
@@ -1433,7 +1435,9 @@ def on_textview_expose_event(self, textview, event):
                 context.set_source_color(self.fill_colors[change[0]])
                 context.fill_preserve()
                 if self.linediffer.locate_chunk(pane, change[1])[0] == self.cursor.chunk:
-                    context.set_source_rgba(1.0, 1.0, 1.0, 0.5)
+                    h = self.fill_colors['current-chunk-highlight']
+                    context.set_source_rgba(
+                        h.red_float, h.green_float, h.blue_float, 0.5)
                     context.fill_preserve()
 
             context.set_source_color(self.line_colors[change[0]])

meld/linkmap.py

@@ -222,7 +222,9 @@ def do_expose_event(self, event):
 
             chunk_idx = self.filediff.linediffer.locate_chunk(left, c[1])[0]
             if chunk_idx == self.filediff.cursor.chunk:
-                context.set_source_rgba(1.0, 1.0, 1.0, 0.5)
+                h = self.fill_colors['current-chunk-highlight']
+                context.set_source_rgba(
+                    h.red_float, h.green_float, h.blue_float, 0.5)
                 context.fill_preserve()
 
             context.set_source_color(self.line_colors[c[0]])