Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-04-29 09:33:20 +02:00
Code Issues Projects Releases Wiki Activity

Migrate touch detection to use QInputDevice instead of QTouchDevice which no longer exists

Browse source
This commit is contained in:
Kovid Goyal 2021-11-19 19:54:13 +05:30
parent db83246385
commit 6dd047e36a
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/calibre/gui2/gestures.py
View file

@ -2,23 +2,17 @@
# License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>
import sys, os
import os
from functools import lru_cache
from qt.core import (
QApplication, QEvent, QMouseEvent, QObject, QPointF, QScroller, Qt, QTouchDevice,
QApplication, QEvent, QMouseEvent, QObject, QPointF, QScroller, Qt, QInputDevice,
pyqtSignal
)
from calibre.constants import iswindows
from calibre.utils.monotonic import monotonic
from polyglot.builtins import itervalues
touch_supported = False
if iswindows and sys.getwindowsversion()[:2] >= (6, 2): # At least windows 7
touch_supported = True
if 'CALIBRE_NO_TOUCH' in os.environ:
touch_supported = False
HOLD_THRESHOLD = 1.0 # seconds
TAP_THRESHOLD = 50 # manhattan pixels
@ -26,6 +20,16 @@
Left, Right, Up, Down = 'Left', 'Right', 'Up', 'Down'
@lru_cache(maxsize=2)
def touch_supported():
if 'CALIBRE_NO_TOUCH' in os.environ:
return False
for dev in QInputDevice.devices():
if dev.type() == QInputDevice.DeviceType.TouchScreen:
return True
return False
class TouchPoint:
def __init__(self, tp):
@ -150,7 +154,7 @@ class GestureManager(QObject):
def __init__(self, view):
QObject.__init__(self, view)
if touch_supported:
if touch_supported():
view.viewport().setAttribute(Qt.WidgetAttribute.WA_AcceptTouchEvents)
self.state = State()
self.state.tapped.connect(
@ -162,11 +166,11 @@ def __init__(self, view):
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.last_tap_at = 0
if touch_supported:
if touch_supported():
self.scroller = QScroller.scroller(view.viewport())
def handle_event(self, ev):
if not touch_supported:
if not touch_supported():
return
etype = ev.type()
if etype in (QEvent.Type.MouseButtonPress, QEvent.Type.MouseMove, QEvent.Type.MouseButtonRelease, QEvent.Type.MouseButtonDblClick):
@ -180,7 +184,7 @@ def handle_event(self, ev):
ev.ignore()
return False
boundary = self.evmap.get(etype, None)
if boundary is None or ev.device().type() != QTouchDevice.DeviceType.TouchScreen:
if boundary is None or ev.deviceType() != QInputDevice.DeviceType.TouchScreen:
return
self.state.update(ev, boundary=boundary)
ev.accept()