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

Handle cancel touch events

Browse Source
This commit is contained in:
Kovid Goyal 2022-07-14 20:57:58 +05:30
parent c1a2fddc29
commit 24db64ff0b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/gui2/gestures.py
View File

@ -75,6 +75,9 @@ class State(QObject):
self.possible_gestures = {Tap, TapAndHold, Flick} self.possible_gestures = {Tap, TapAndHold, Flick}
def update(self, ev, boundary='update'): def update(self, ev, boundary='update'):
if boundary == 'cancel':
self.clear()
return
if boundary == 'start': if boundary == 'start':
self.start() self.start()
@ -164,7 +167,7 @@ class GestureManager(QObject):
connect_lambda(self.state.tap_hold_started, self, lambda self, tp: self.handle_tap_hold('start', tp)) connect_lambda(self.state.tap_hold_started, self, lambda self, tp: self.handle_tap_hold('start', tp))
connect_lambda(self.state.tap_hold_updated, self, lambda self, tp: self.handle_tap_hold('update', tp)) connect_lambda(self.state.tap_hold_updated, self, lambda self, tp: self.handle_tap_hold('update', tp))
connect_lambda(self.state.tap_hold_finished, self, lambda self, tp: self.handle_tap_hold('end', tp)) connect_lambda(self.state.tap_hold_finished, self, lambda self, tp: self.handle_tap_hold('end', tp))
self.evmap = {QEvent.Type.TouchBegin: 'start', QEvent.Type.TouchUpdate: 'update', QEvent.Type.TouchEnd: 'end'} self.evmap = {QEvent.Type.TouchBegin: 'start', QEvent.Type.TouchUpdate: 'update', QEvent.Type.TouchEnd: 'end', QEvent.Type.TouchCancel: 'cancel'}
self.last_tap_at = 0 self.last_tap_at = 0
if touch_supported(): if touch_supported():
self.scroller = QScroller.scroller(view.viewport()) self.scroller = QScroller.scroller(view.viewport())
@ -183,7 +186,7 @@ class GestureManager(QObject):
if etype == QEvent.Type.Wheel and self.scroller.state() != QScroller.State.Inactive: if etype == QEvent.Type.Wheel and self.scroller.state() != QScroller.State.Inactive:
ev.ignore() ev.ignore()
return False return False
boundary = self.evmap.get(etype, None) boundary = self.evmap.get(etype)
if boundary is None or ev.deviceType() != QInputDevice.DeviceType.TouchScreen: if boundary is None or ev.deviceType() != QInputDevice.DeviceType.TouchScreen:
return return
self.state.update(ev, boundary=boundary) self.state.update(ev, boundary=boundary)