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

Port many images fix to browser viewer as well

Browse Source
This commit is contained in:
Kovid Goyal 2018-06-06 18:13:39 +05:30
parent 1cbd6ccf9b
commit dc922e5a33
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/pyj/read_book/paged_mode.pyj
View File

@ -78,11 +78,16 @@ def fit_images():
# force a relayout if the render tree is dirty. # force a relayout if the render tree is dirty.
images = [] images = []
vimages = [] vimages = []
img_tags = document.getElementsByTagName('img')
bounding_rects = v'[]'
for img_tag in img_tags:
bounding_rects.push(img_tag.getBoundingClientRect())
maxh = screen_height maxh = screen_height
for img in document.getElementsByTagName('img'): for i in range(img_tags.length):
img = img_tags[i]
br = bounding_rects[i]
previously_limited = get_elem_data(img, 'width-limited', False) previously_limited = get_elem_data(img, 'width-limited', False)
data = get_elem_data(img, 'img-data', None) data = get_elem_data(img, 'img-data', None)
br = img.getBoundingClientRect()
if data is None: if data is None:
data = {'left':br.left, 'right':br.right, 'height':br.height, 'display': img.style.display} data = {'left':br.left, 'right':br.right, 'height':br.height, 'display': img.style.display}
set_elem_data(img, 'img-data', data) set_elem_data(img, 'img-data', data)
@ -100,13 +105,13 @@ def fit_images():
set_css(img, break_before='auto', display=data.display) set_css(img, break_before='auto', display=data.display)
set_css(img, break_inside='avoid') set_css(img, break_inside='avoid')
for img, max_width in images: for img_tag, max_width in images:
img.style.setProperty('max-width', max_width+'px') img_tag.style.setProperty('max-width', max_width+'px')
set_elem_data(img, 'width-limited', True) set_elem_data(img_tag, 'width-limited', True)
for img in vimages: for img_tag in vimages:
data = get_elem_data(img, 'img-data', None) data = get_elem_data(img_tag, 'img-data', None)
set_css(img, break_before='always', max_height=maxh+'px') set_css(img_tag, break_before='always', max_height=maxh+'px')
if data.height > maxh: if data.height > maxh:
# This is needed to force the image onto a new page, without # This is needed to force the image onto a new page, without
# it, the webkit algorithm may still decide to split the image # it, the webkit algorithm may still decide to split the image