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

Finish up keyboard handling in paged mode

Browse Source
This commit is contained in:
Kovid Goyal 2016-04-29 20:50:23 +05:30
parent 11136aab92
commit c0459236d7
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ from read_book.cfi import scroll_to as cfi_scroll_to, at_point as cfi_at_point,
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
import traceback import traceback
from utils import get_elem_data, set_elem_data, viewport_to_document from utils import get_elem_data, set_elem_data, viewport_to_document, document_width
def first_child(parent): def first_child(parent):
c = parent.firstChild c = parent.firstChild
@ -178,18 +178,21 @@ def layout(is_single_page):
evt.preventDefault() evt.preventDefault()
) )
# Some browser engine, WebKit at least, adjust column widths to please
# themselves, unless the container width is an exact multiple, so we check
# for that and manually set the container widths.
def check_column_widths(): def check_column_widths():
ncols = (document.body.scrollWidth + gap) / col_and_gap ncols = (document.body.scrollWidth + gap) / col_and_gap
if ncols is not Math.floor(ncols): if ncols is not Math.floor(ncols):
n = Math.floor(ncols) n = Math.floor(ncols)
dw = (n*col_width + (n-1)*gap) dw = n*col_width + (n-1)*gap
data = {'col_with':col_width, 'gap':gap, 'scrollWidth':document.body.scrollWidth, 'ncols':ncols, 'desired_width':dw} data = {'col_with':col_width, 'gap':gap, 'scrollWidth':document.body.scrollWidth, 'ncols':ncols, 'desired_width':dw}
return data return data
data = check_column_widths() data = check_column_widths()
if data: if data:
dw = data.desired_width dw = data.desired_width
set_css(document.body, max_width=dw + 'px', min_width=dw + 'px') for elem in document.documentElement, document.body:
set_css(document.documentElement, max_width=dw + 'px', min_width=dw + 'px') set_css(elem, max_width=dw + 'px', min_width=dw + 'px')
data = check_column_widths() data = check_column_widths()
if data: if data:
print('WARNING: column layout broken', data) print('WARNING: column layout broken', data)
@ -463,21 +466,31 @@ def onwheel(evt):
else: else:
scroll_to_xpos(x) scroll_to_xpos(x)
def scroll_by_page(backward, by_screen):
if by_screen:
pos = previous_screen_location() if backward else next_screen_location()
else:
pos = previous_col_location() if backward else next_col_location()
if pos is -1:
get_boss().send_message('next_spine_item', previous=backward)
else:
scroll_to_xpos(pos)
def onkeydown(evt): def onkeydown(evt):
handled = False handled = False
key = get_key(evt) key = get_key(evt)
if key is 'up' or key is 'down': if key is 'up' or key is 'down':
handled = True handled = True
if evt.ctrlKey: if evt.ctrlKey:
goto_boundary(-1 if key is 'up' else 1) window.scrollTo(0 if key is 'left' else document_width(), 0)
else: else:
smooth_y_scroll(key is 'up') scroll_by_page(key is 'up', True)
elif key is 'left' or key is 'right': elif key is 'left' or key is 'right':
handled = True handled = True
if evt.ctrlKey: if evt.ctrlKey:
window.scrollTo(0 if key is 'left' else document_width(), window.pageYOffset) window.scrollTo(0 if key is 'left' else document_width(), 0)
else: else:
window.scrollBy(-15 if key is 'left' else 15, 0) scroll_by_page(key is 'left', False)
elif key is 'home' or key is 'end': elif key is 'home' or key is 'end':
handled = True handled = True
if evt.ctrlKey: if evt.ctrlKey:
@ -486,9 +499,9 @@ def onkeydown(evt):
if key is 'home': if key is 'home':
window.scrollTo(0, 0) window.scrollTo(0, 0)
else: else:
window.scrollTo(document.body.scrollWidth, 0) window.scrollTo(document_width(), 0)
elif key is 'pageup' or key is 'pagedown' or key is 'space': elif key is 'pageup' or key is 'pagedown' or key is 'space':
handled = True handled = True
scroll_by_page(-1 if key is 'pageup' else 1) scroll_by_page(key is 'pageup', True)
if handled: if handled:
evt.preventDefault() evt.preventDefault()