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

Clean up progress_frac reporting in flow mode

Browse Source
This commit is contained in:
Kovid Goyal 2019-10-15 11:58:58 +05:30
parent d66ed41ef9
commit be58929e95
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,10 @@ from read_book.cfi import (
from read_book.globals import get_boss from read_book.globals import get_boss
from read_book.settings import opts from read_book.settings import opts
from read_book.viewport import scroll_viewport from read_book.viewport import scroll_viewport
from utils import document_width, get_elem_data, set_elem_data, viewport_to_document from utils import (
document_height, document_width, get_elem_data, set_elem_data,
viewport_to_document
)
def first_child(parent): def first_child(parent):
@ -136,7 +139,7 @@ def layout(is_single_page):
handle_rtl_body(body_style) handle_rtl_body(body_style)
# Check if the current document is a full screen layout like # Check if the current document is a full screen layout like
# cover, if so we treat it specially. # cover, if so we treat it specially.
single_screen = (document.body.scrollHeight < scroll_viewport.height() + 75) single_screen = (document_height() < scroll_viewport.height() + 75)
first_layout = True first_layout = True
has_svg = document.getElementsByTagName('svg').length > 0 has_svg = document.getElementsByTagName('svg').length > 0
imgs = document.getElementsByTagName('img') imgs = document.getElementsByTagName('img')
@ -445,10 +448,10 @@ def progress_frac(frac):
if limit <= 0: if limit <= 0:
return 0.0 return 0.0
return current_scroll_offset() / limit return current_scroll_offset() / limit
limit = document.body.scrollHeight - scroll_viewport.height() limit = document_height() - scroll_viewport.height()
if limit <= 0: if limit <= 0:
return 0.0 return 0.0
return window.pageYOffset / limit return Math.max(0, Math.min(window.pageYOffset / limit, 1))
def onwheel(evt): def onwheel(evt):