[meld: 137/180] linkmap: Make LinkMap do its own colour handling
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld: 137/180] linkmap: Make LinkMap do its own colour handling
- Date: Thu, 23 Jul 2015 21:42:53 +0000 (UTC)
commit ea0e96f7cdded5e9a6a722e00feef5241e642c7d
Author: Kai Willadsen <kai willadsen gmail com>
Date: Mon Oct 6 15:57:20 2014 +1000
linkmap: Make LinkMap do its own colour handling
meld/filediff.py | 3 ---
meld/linkmap.py | 11 ++++++-----
2 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 51f638e..6d021e7 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -319,9 +319,6 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
self.fill_colors, self.line_colors = get_common_theme(style)
- for associated in self.linkmap:
- associated.set_color_scheme([self.fill_colors, self.line_colors])
-
self.queue_draw()
def on_focus_change(self):
diff --git a/meld/linkmap.py b/meld/linkmap.py
index 30d0e24..03a0eaf 100644
--- a/meld/linkmap.py
+++ b/meld/linkmap.py
@@ -19,6 +19,8 @@ import math
from gi.repository import Gtk
+from meld.misc import get_common_theme
+
# Rounded rectangle corner radius for culled changes display
RADIUS = 3
@@ -38,11 +40,10 @@ class LinkMap(Gtk.DrawingArea):
self.views.reverse()
self.view_indices = [filediff.textview.index(t) for t in self.views]
- self.set_color_scheme((filediff.fill_colors, filediff.line_colors))
-
- def set_color_scheme(self, color_map):
- self.fill_colors, self.line_colors = color_map
- self.queue_draw()
+ def do_style_updated(self, *args):
+ Gtk.DrawingArea.do_style_updated(self)
+ style = self.get_style_context()
+ self.fill_colors, self.line_colors = get_common_theme(style)
def do_draw(self, context):
if not self.filediff:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]