Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2026-02-13 06:54:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'outline-colors' of https://github.com/un-pogaz/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2026-01-21 14:55:38 +05:30
commit 0e444b577a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/gui2/library/bookshelf_view.py
View File

@ -224,6 +224,8 @@ class WoodTheme(NamedTuple):
class ColorTheme(NamedTuple):
text_color_for_dark_background: QColor
text_color_for_light_background: QColor
outline_color_for_dark_background: QColor
outline_color_for_light_background: QColor
# Divider colors
divider_text_color: QColor
@ -240,6 +242,8 @@ class ColorTheme(NamedTuple):
return ColorTheme(
text_color_for_dark_background=dark_palette().color(QPalette.ColorRole.WindowText),
text_color_for_light_background=light_palette().color(QPalette.ColorRole.WindowText),
outline_color_for_dark_background=QColor(0, 0, 0),
outline_color_for_light_background=QColor(255, 255, 255),
divider_text_color=palette.color(QPalette.ColorRole.WindowText),
current_selected_color=palette.color(QPalette.ColorRole.LinkVisited),
current_color=palette.color(QPalette.ColorRole.Mid),
@ -1421,8 +1425,6 @@ class BookshelfView(MomentumScrollMixin, QAbstractScrollArea):
def __init__(self, gui):
super().__init__(gui)
self.text_color_for_dark_background = QColor()
self.text_color_for_light_background = QColor()
self.auto_scroll = True
self.scroll_to_current_after_layout: bool = False
self.theme: ColorTheme = None
@ -2248,11 +2250,11 @@ class BookshelfView(MomentumScrollMixin, QAbstractScrollArea):
def get_contrasting_text_color(self, background_color: QColor) -> tuple[QColor, QColor]:
if not background_color or not background_color.isValid():
return self.theme.text_color_for_light_background, self.theme.text_color_for_dark_background
return self.theme.text_color_for_light_background, self.theme.outline_color_for_light_background
if (contrast_ratio(background_color, self.theme.text_color_for_dark_background)
> contrast_ratio(background_color, self.theme.text_color_for_light_background)):
return self.theme.text_color_for_dark_background, self.theme.text_color_for_light_background
return self.theme.text_color_for_light_background, self.theme.text_color_for_dark_background
return self.theme.text_color_for_dark_background, self.theme.outline_color_for_dark_background
return self.theme.text_color_for_light_background, self.theme.outline_color_for_light_background
# Selection methods (required for AlternateViews integration)

4
src/calibre/gui2/preferences/look_feel_tabs/bookshelf_view.py
View File

@ -261,8 +261,10 @@ def evaluate(book, context):
@lru_cache(maxsize=2)
def color_label_map(self) -> dict[str, str]:
return {
'text_color_for_dark_background': _('Text on &dark spine background'),
'text_color_for_light_background': _('Text on &light spine background'),
'text_color_for_dark_background': _('Text on &dark spine background'),
'outline_color_for_light_background': _('&Outline on light spine background'),
'outline_color_for_dark_background': _('Outli&ne on dark spine background'),
'divider_background_color': _('Divider &background'),
'divider_line_color': _('&Line on the divider'),
'divider_text_color': _('Text on the &divider'),