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

Move forward_gesture() to ui_operations

Browse Source
This commit is contained in:
Kovid Goyal 2019-08-06 09:52:27 +05:30
parent 377b90ea0d
commit 9edb593773
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,4 +74,5 @@ ui_operations = {
'show_error': None, 'show_error': None,
'redisplay_book': None, 'redisplay_book': None,
'reload_book': None, 'reload_book': None,
'forward_gesture': None,
} }

5
src/pyj/read_book/touch.pyj
View File

@ -2,8 +2,7 @@
# License: GPL v3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net> # License: GPL v3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
from __python__ import bound_methods, hash_literals from __python__ import bound_methods, hash_literals
from book_list.globals import get_read_ui from read_book.globals import get_boss, ui_operations
from read_book.globals import get_boss
from read_book.viewport import scroll_viewport from read_book.viewport import scroll_viewport
HOLD_THRESHOLD = 750 # milliseconds HOLD_THRESHOLD = 750 # milliseconds
@ -257,7 +256,7 @@ class BookTouchHandler(TouchHandler):
return return
gesture.type = 'show-chrome' gesture.type = 'show-chrome'
if self.for_side_margin: if self.for_side_margin:
get_read_ui().view.forward_gesture(gesture) ui_operations.forward_gesture(gesture)
else: else:
get_boss().handle_gesture(gesture) get_boss().handle_gesture(gesture)

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

@ -62,6 +62,7 @@ class ReadUI:
ui_operations.show_error = self.show_error.bind(self) ui_operations.show_error = self.show_error.bind(self)
ui_operations.redisplay_book = self.redisplay_book.bind(self) ui_operations.redisplay_book = self.redisplay_book.bind(self)
ui_operations.reload_book = self.reload_book.bind(self) ui_operations.reload_book = self.reload_book.bind(self)
ui_operations.forward_gesture = self.forward_gesture.bind(self)
def on_resize(self): def on_resize(self):
self.view.on_resize() self.view.on_resize()
@ -145,6 +146,9 @@ class ReadUI:
def redisplay_book(self): def redisplay_book(self):
self.view.redisplay_book() self.view.redisplay_book()
def forward_gesture(self, gesture):
self.view.forward_gesture(gesture)
def update_font_size(self): def update_font_size(self):
self.view.update_font_size() self.view.update_font_size()

5
src/pyj/viewer-main.pyj
View File

@ -214,6 +214,10 @@ def reload_book():
to_python.reload_book() to_python.reload_book()
def forward_gesture(gesture):
view.forward_gesture(gesture)
if window is window.top: if window is window.top:
# main # main
ui_operations.get_file = get_file ui_operations.get_file = get_file
@ -222,6 +226,7 @@ if window is window.top:
ui_operations.show_error = show_error ui_operations.show_error = show_error
ui_operations.redisplay_book = redisplay_book ui_operations.redisplay_book = redisplay_book
ui_operations.reload_book = reload_book ui_operations.reload_book = reload_book
ui_operations.forward_gesture = forward_gesture
document.body.appendChild(E.div(id='view')) document.body.appendChild(E.div(id='view'))
window.onerror = onerror window.onerror = onerror
create_modal_container() create_modal_container()