mirror of
git://github.com/kovidgoyal/calibre.git
synced 2025-12-16 01:55:57 +01:00
...
This commit is contained in:
parent
3538bbe4dc
commit
966fae7793
1 changed files with 6 additions and 6 deletions
|
|
@ -769,10 +769,10 @@ def data(self, index, role):
|
|||
|
||||
for k, fmt in self.db.prefs['column_color_rules']:
|
||||
if k == key:
|
||||
col = self.column_color(id_, key, fmt, self.db,
|
||||
ccol = self.column_color(id_, key, fmt, self.db,
|
||||
self.formatter, self.color_cache, self.colors)
|
||||
if col is not None:
|
||||
return col
|
||||
if ccol is not None:
|
||||
return ccol
|
||||
|
||||
if self.is_custom_column(key) and \
|
||||
self.custom_columns[key]['datatype'] == 'enumeration':
|
||||
|
|
@ -791,10 +791,10 @@ def data(self, index, role):
|
|||
|
||||
if self.color_row_fmt_cache:
|
||||
key = color_row_key
|
||||
col = self.column_color(id_, key, self.color_row_fmt_cache,
|
||||
ccol = self.column_color(id_, key, self.color_row_fmt_cache,
|
||||
self.db, self.formatter, self.color_cache, self.colors)
|
||||
if col is not None:
|
||||
return col
|
||||
if ccol is not None:
|
||||
return ccol
|
||||
|
||||
self.column_color.mi = None
|
||||
return NONE
|
||||
|
|
|
|||
Loading…
Reference in a new issue