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

Viewer: Ensure there is no bleed between pages when using single page per screen

Browse Source
This commit is contained in:
Kovid Goyal 2020-03-22 10:34:11 +05:30
parent 8dc0e875c9
commit c345691c1d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,9 +59,12 @@ def create_page_div(elem):
_in_paged_mode = False _in_paged_mode = False
def in_paged_mode(): def in_paged_mode():
return _in_paged_mode return _in_paged_mode
col_width = screen_width = screen_height = cols_per_screen = gap = col_and_gap = number_of_cols = last_scrolled_to_column = 0 col_width = screen_width = screen_height = cols_per_screen = gap = col_and_gap = number_of_cols = last_scrolled_to_column = 0
is_full_screen_layout = False is_full_screen_layout = False
def reset_paged_mode_globals(): def reset_paged_mode_globals():
nonlocal _in_paged_mode, col_width, col_and_gap, screen_height, gap, screen_width, is_full_screen_layout, cols_per_screen, number_of_cols, last_scrolled_to_column nonlocal _in_paged_mode, col_width, col_and_gap, screen_height, gap, screen_width, is_full_screen_layout, cols_per_screen, number_of_cols, last_scrolled_to_column
scroll_viewport.reset_globals() scroll_viewport.reset_globals()
@ -197,12 +200,12 @@ def layout(is_single_page, on_resize):
# Calculate the column width so that cols_per_screen columns fit exactly in # Calculate the column width so that cols_per_screen columns fit exactly in
# the window width, with their separator margins # the window width, with their separator margins
ww = col_width = screen_width = scroll_viewport.width() ww = col_width = screen_width = scroll_viewport.width()
gap = 0 sm = opts.margin_left + opts.margin_right
gap = sm
if n > 1: if n > 1:
# Adjust the side margin so that the window width satisfies # Adjust the side margin so that the window width satisfies
# col_width * n + (n-1) * 2 * side_margin = window_width # col_width * n + (n-1) * 2 * side_margin = window_width
sm = opts.margin_left + opts.margin_right gap += ((ww + sm) % n) # Ensure ww + gap is a multiple of n
gap = sm + ((ww + sm) % n) # Ensure ww + gap is a multiple of n
col_width = ((ww + gap) // n) - gap col_width = ((ww + gap) // n) - gap
screen_height = scroll_viewport.height() screen_height = scroll_viewport.height()