Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add scroll_mouse_boundary_delay preference

Browse Source
This commit is contained in:
Pedro Fonseca 2024-11-05 17:04:06 +01:00
parent 90e0fa9e92
commit 13b332bd8a
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pyj/read_book/flow_mode.pyj
View File

@ -87,12 +87,12 @@ def _check_for_scroll_end(func, obj, args, report):
if last_change_spine_item_request.name is csi.name and now - last_change_spine_item_request.at < 2000:
return False
## delay change on boundaries
if opts.scroll_stop_boundaries :
if last_change_spine_item_request.ignoreUntil is None :
last_change_spine_item_request.ignoreUntil = now + 500
if now < last_change_spine_item_request.ignoreUntil:
if opts.scroll_mouse_boundary_delay > 0 :
if last_change_spine_item_request.denied is None :
last_change_spine_item_request.denied = now
if now - last_change_spine_item_request.denied < opts.scroll_mouse_boundary_delay * 1000 :
return False
last_change_spine_item_request.ignoreUntil = None
last_change_spine_item_request.denied = None
# perform change
last_change_spine_item_request.name = csi.name
last_change_spine_item_request.at = now
@ -101,7 +101,7 @@ def _check_for_scroll_end(func, obj, args, report):
go_to_previous_page = not go_to_previous_page
get_boss().send_message('next_spine_item', previous=go_to_previous_page)
return False
last_change_spine_item_request.ignoreUntil = None
last_change_spine_item_request.denied = None
if report:
report_human_scroll(scroll_viewport.block_pos() - before)
return True

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

@ -22,6 +22,9 @@ MAX_SCROLL_AUTO_DELAY = 50
MIN_SCROLL_SPEED_SMOOTH = 5
MAX_SCROLL_SPEED_SMOOTH = 80
MIN_SCROLL_MOUSE_DELAY = 0
MAX_SCROLL_MOUSE_DELAY = 5
def restore_defaults():
container = get_container()
for control in container.querySelectorAll('input[name]'):
@ -113,6 +116,14 @@ def create_scrolling_panel(container, apply_func, cancel_func):
step=0.25,
min=MIN_SCROLL_AUTO_DELAY,
max=MAX_SCROLL_AUTO_DELAY
),
*spinner(
'scroll_mouse_boundary_delay',
_('Seconds to pause when mouse-scrolling past internal file boundaries'),
title=_('Set to zero to scroll past internal file boundaries without delay'),
step=0.25,
min=MIN_SCROLL_MOUSE_DELAY,
max=MAX_SCROLL_MOUSE_DELAY
)
)
)

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

@ -29,6 +29,7 @@ def update_settings(settings):
opts.paged_wheel_section_jumps = v'!!settings.paged_wheel_section_jumps'
opts.paged_pixel_scroll_threshold = settings.paged_pixel_scroll_threshold
opts.scroll_auto_boundary_delay = settings.scroll_auto_boundary_delay
opts.scroll_mouse_boundary_delay = settings.scroll_mouse_boundary_delay
opts.scroll_stop_boundaries = v'!!settings.scroll_stop_boundaries'
opts.reverse_page_turn_zones = v'!!settings.reverse_page_turn_zones'
opts.user_stylesheet = settings.user_stylesheet

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

@ -1050,6 +1050,7 @@ class View:
'lines_per_sec_auto': sd.get('lines_per_sec_auto'),
'lines_per_sec_smooth': sd.get('lines_per_sec_smooth'),
'scroll_auto_boundary_delay': sd.get('scroll_auto_boundary_delay'),
'scroll_mouse_boundary_delay': sd.get('scroll_mouse_boundary_delay'),
'scroll_stop_boundaries': sd.get('scroll_stop_boundaries'),
'reverse_page_turn_zones': sd.get('reverse_page_turn_zones'),
'gesture_overrides': sd.get('gesture_overrides'),

1
src/pyj/session.pyj
View File

@ -55,6 +55,7 @@ all_settings = {
'paged_pixel_scroll_threshold': {'default': 60, 'category': 'read_book'},
'read_mode': {'default': 'paged', 'category': 'read_book', 'is_local': True},
'scroll_auto_boundary_delay': {'default': 5, 'category': 'read_book', 'is_local': True},
'scroll_mouse_boundary_delay': {'default': 0, 'category': 'read_book', 'is_local': True},
'scroll_stop_boundaries': {'default': False, 'category': 'read_book', 'is_local': True},
'standalone_font_settings': {'default': {}, 'category': 'read_book', 'is_local': True},
'standalone_misc_settings': {'default': {}, 'category': 'read_book', 'is_local': True},