Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

E-book viewer: Fix a regression in 8.4 that broke fading of the background image. Fixes #2115057 [image fade in styles does not work](https://bugs.launchpad.net/calibre/+bug/2115057)

Browse Source
This commit is contained in:
Kovid Goyal 2025-06-22 09:48:01 +05:30
parent 69faf8c936
commit 38628e4c97
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pyj/read_book/settings.pyj
View File

@ -12,7 +12,6 @@ opts = {}
def update_settings(settings): def update_settings(settings):
settings = Object.assign({}, session_defaults(), settings) settings = Object.assign({}, session_defaults(), settings)
opts.base_font_size = max(8, min(settings.base_font_size, 64)) opts.base_font_size = max(8, min(settings.base_font_size, 64))
opts.bg_image_fade = settings.bg_image_fade or 'transparent'
opts.color_scheme = settings.color_scheme opts.color_scheme = settings.color_scheme
opts.columns_per_screen = settings.columns_per_screen opts.columns_per_screen = settings.columns_per_screen
opts.cover_preserve_aspect_ratio = v'!!settings.cover_preserve_aspect_ratio' opts.cover_preserve_aspect_ratio = v'!!settings.cover_preserve_aspect_ratio'
@ -71,7 +70,7 @@ def apply_colors(is_content_popup):
# set background color to transparent so that the users background # set background color to transparent so that the users background
# color which is set on the iframe is used instead # color which is set on the iframe is used instead
elem.style.backgroundColor = 'transparent' elem.style.backgroundColor = 'transparent'
des.backgroundColor = opts.bg_image_fade des.backgroundColor = 'transparent'
ss = document.getElementById('calibre-color-scheme-style-overrides') ss = document.getElementById('calibre-color-scheme-style-overrides')
if not ss: if not ss:
ss = E.style(id=styles_id, type='text/css') ss = E.style(id=styles_id, type='text/css')

15
src/pyj/read_book/view.pyj
View File

@ -856,6 +856,15 @@ class View:
bg_image = sd.get('background_image') bg_image = sd.get('background_image')
if bg_image: if bg_image:
s.backgroundImage = f'url({modify_background_image_url_for_fetch(bg_image)})' s.backgroundImage = f'url({modify_background_image_url_for_fetch(bg_image)})'
fade = int(sd.get('background_image_fade'))
if fade > 0:
rgba = cached_color_to_rgba(ans.background)
bg_image_fade = f'rgba({rgba[0]}, {rgba[1]}, {rgba[2]}, {fade/100})'
iframe.parentNode.style.backgroundColor = bg_image_fade
for which in 'left right'.split(' '):
ms = document.getElementById(f'book-{which}-margin').style
if ms.backgroundColor is 'transparent':
ms.backgroundColor = bg_image_fade
else: else:
s.backgroundColor = ans.background or 'white' s.backgroundColor = ans.background or 'white'
s.backgroundImage = 'none' s.backgroundImage = 'none'
@ -1024,12 +1033,7 @@ class View:
def iframe_settings(self, name): def iframe_settings(self, name):
sd = get_session_data() sd = get_session_data()
bg_image_fade = 'transparent'
cs = self.apply_color_scheme() cs = self.apply_color_scheme()
fade = int(sd.get('background_image_fade'))
rgba = cached_color_to_rgba(cs.background)
if self.iframe.style.backgroundImage is not 'none' and fade > 0:
bg_image_fade = f'rgba({rgba[0]}, {rgba[1]}, {rgba[2]}, {fade/100})'
return { return {
'margin_left': 0 if name is self.book.manifest.title_page_name else sd.get('margin_left'), 'margin_left': 0 if name is self.book.manifest.title_page_name else sd.get('margin_left'),
'margin_right': 0 if name is self.book.manifest.title_page_name else sd.get('margin_right'), 'margin_right': 0 if name is self.book.manifest.title_page_name else sd.get('margin_right'),
@ -1040,7 +1044,6 @@ class View:
'color_scheme': cs, 'color_scheme': cs,
'override_book_colors': sd.get('override_book_colors'), 'override_book_colors': sd.get('override_book_colors'),
'is_dark_theme': cs.is_dark_theme, 'is_dark_theme': cs.is_dark_theme,
'bg_image_fade': bg_image_fade,
'base_font_size': sd.get('base_font_size'), 'base_font_size': sd.get('base_font_size'),
'user_stylesheet': sd.get('user_stylesheet'), 'user_stylesheet': sd.get('user_stylesheet'),
'keyboard_shortcuts': sd.get('keyboard_shortcuts'), 'keyboard_shortcuts': sd.get('keyboard_shortcuts'),