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

Viewer: Add an option to have taps turn by screenfulls instead of pages, under Scrolling behavior

Browse Source
This commit is contained in:
Kovid Goyal 2020-04-22 20:37:45 +05:30
parent 7141ebfafc
commit 0872338ae7
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
5 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -627,9 +627,9 @@ def handle_gesture(gesture):
if not gesture.active or gesture.is_held: if not gesture.active or gesture.is_held:
scroll_by_page(gesture.direction is 'right', True) scroll_by_page(gesture.direction is 'right', True)
elif gesture.type is 'prev-page': elif gesture.type is 'prev-page':
scroll_by_page(True, False) scroll_by_page(True, opts.paged_taps_scroll_by_screen)
elif gesture.type is 'next-page': elif gesture.type is 'next-page':
scroll_by_page(False, False) scroll_by_page(False, opts.paged_taps_scroll_by_screen)
elif gesture.type is 'long-tap': elif gesture.type is 'long-tap':
r = word_at_point(gesture.viewport_x, gesture.viewport_y) r = word_at_point(gesture.viewport_x, gesture.viewport_y)
if r: if r:

4
src/pyj/read_book/prefs/scrolling.pyj
View File

@ -63,11 +63,13 @@ def create_scrolling_panel(container, apply_func, cancel_func):
ans.valueAsNumber = sd.get(name, defaults[name]) ans.valueAsNumber = sd.get(name, defaults[name])
return E.label("for"=name, text), ans return E.label("for"=name, text), ans
container.appendChild(E.div(style='margin-top:1ex', _('Control how mouse based scrolling works in paged mode'))) container.appendChild(E.div(style='margin-top:1ex', _('Control how scrolling works in paged mode')))
container.appendChild(cb( container.appendChild(cb(
'paged_wheel_scrolls_by_screen', _('Mouse wheel scrolls by screen fulls instead of pages'))) 'paged_wheel_scrolls_by_screen', _('Mouse wheel scrolls by screen fulls instead of pages')))
container.appendChild(cb( container.appendChild(cb(
'paged_margin_clicks_scroll_by_screen', _('Clicking on the margins scrolls by screen fulls instead of pages'))) 'paged_margin_clicks_scroll_by_screen', _('Clicking on the margins scrolls by screen fulls instead of pages')))
container.appendChild(cb(
'paged_taps_scroll_by_screen', _('Tapping scrolls by screen fulls instead of pages')))
container.appendChild(E.hr()) container.appendChild(E.hr())
container.appendChild(E.div(style='margin-top:1ex', _('Control how smooth scrolling works in flow mode'))) container.appendChild(E.div(style='margin-top:1ex', _('Control how smooth scrolling works in flow mode')))

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

@ -24,6 +24,7 @@ def update_settings(settings):
opts.margin_right = max(0, settings.margin_right) opts.margin_right = max(0, settings.margin_right)
opts.override_book_colors = settings.override_book_colors opts.override_book_colors = settings.override_book_colors
opts.paged_wheel_scrolls_by_screen = v'!!settings.paged_wheel_scrolls_by_screen' opts.paged_wheel_scrolls_by_screen = v'!!settings.paged_wheel_scrolls_by_screen'
opts.paged_taps_scroll_by_screen = v'!!settings.paged_taps_scroll_by_screen'
opts.scroll_auto_boundary_delay = settings.scroll_auto_boundary_delay opts.scroll_auto_boundary_delay = settings.scroll_auto_boundary_delay
opts.scroll_stop_boundaries = v'!!settings.scroll_stop_boundaries' opts.scroll_stop_boundaries = v'!!settings.scroll_stop_boundaries'
opts.user_stylesheet = settings.user_stylesheet opts.user_stylesheet = settings.user_stylesheet

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

@ -840,6 +840,7 @@ class View:
'hide_tooltips': sd.get('hide_tooltips'), 'hide_tooltips': sd.get('hide_tooltips'),
'cover_preserve_aspect_ratio': sd.get('cover_preserve_aspect_ratio'), 'cover_preserve_aspect_ratio': sd.get('cover_preserve_aspect_ratio'),
'paged_wheel_scrolls_by_screen': sd.get('paged_wheel_scrolls_by_screen'), 'paged_wheel_scrolls_by_screen': sd.get('paged_wheel_scrolls_by_screen'),
'paged_taps_scroll_by_screen': sd.get('paged_taps_scroll_by_screen'),
'lines_per_sec_auto': sd.get('lines_per_sec_auto'), 'lines_per_sec_auto': sd.get('lines_per_sec_auto'),
'lines_per_sec_smooth': sd.get('lines_per_sec_smooth'), 'lines_per_sec_smooth': sd.get('lines_per_sec_smooth'),
'scroll_auto_boundary_delay': sd.get('scroll_auto_boundary_delay'), 'scroll_auto_boundary_delay': sd.get('scroll_auto_boundary_delay'),

1
src/pyj/session.pyj
View File

@ -50,6 +50,7 @@ defaults = {
'override_book_colors': 'never', 'override_book_colors': 'never',
'paged_margin_clicks_scroll_by_screen': True, 'paged_margin_clicks_scroll_by_screen': True,
'paged_wheel_scrolls_by_screen': False, 'paged_wheel_scrolls_by_screen': False,
'paged_taps_scroll_by_screen': False,
'read_mode': 'paged', 'read_mode': 'paged',
'scroll_auto_boundary_delay': 5, 'scroll_auto_boundary_delay': 5,
'scroll_stop_boundaries': False, 'scroll_stop_boundaries': False,