From 56122b0a54e8b46278eb20698697b80a9824f2ed Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Sat, 13 Jan 2018 17:20:16 +0000 Subject: [PATCH] Use None as the foreground colour for untagged rows in list views The call to get_style_context is not required. It also caused problems in Windows due to excessive calls to the foreground_color method. Fixes #10365. --- gramps/gui/views/listview.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gramps/gui/views/listview.py b/gramps/gui/views/listview.py index a0941dd7a..484c7d957 100644 --- a/gramps/gui/views/listview.py +++ b/gramps/gui/views/listview.py @@ -67,7 +67,7 @@ from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.sgettext from ..ddtargets import DdTargets from ..plug.quick import create_quickreport_menu, create_web_connect_menu -from ..utils import is_right_click, rgb_to_hex +from ..utils import is_right_click from ..widgets.interactivesearchbox import InteractiveSearchBox #---------------------------------------------------------------- @@ -278,14 +278,11 @@ class ListView(NavigationView): def foreground_color(self, column, renderer, model, iter_, data=None): ''' Set the foreground color of the cell renderer. We use a cell data - function because we don't want to set the color of untagged rows. + function because there is a problem returning None from a model. ''' fg_color = model.get_value(iter_, model.color_column()) - if not fg_color: - context = self.list.get_style_context() - color = context.get_color(Gtk.StateFlags.ACTIVE) - fg_color = rgb_to_hex((color.red, color.green, color.blue)) - + if fg_color == '': + fg_color = None renderer.set_property('foreground', fg_color) def set_active(self):