mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Get rid of the no longer needed workaround for broken Qt 4 touch event handling
This commit is contained in:
parent
92c81aa6d0
commit
2949126dd6
@ -17,13 +17,7 @@ from calibre.constants import iswindows
|
|||||||
touch_supported = False
|
touch_supported = False
|
||||||
if iswindows and sys.getwindowsversion()[:2] >= (6, 2): # At least windows 7
|
if iswindows and sys.getwindowsversion()[:2] >= (6, 2): # At least windows 7
|
||||||
from ctypes import wintypes
|
from ctypes import wintypes
|
||||||
try:
|
touch_supported = True
|
||||||
RegisterTouchWindow = ctypes.windll.user32.RegisterTouchWindow
|
|
||||||
RegisterTouchWindow.argtypes = (wintypes.HWND, wintypes.ULONG)
|
|
||||||
RegisterTouchWindow.restype = wintypes.BOOL
|
|
||||||
touch_supported = True
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
SWIPE_HOLD_INTERVAL = 0.5 # seconds
|
SWIPE_HOLD_INTERVAL = 0.5 # seconds
|
||||||
HOLD_THRESHOLD = 1.0 # seconds
|
HOLD_THRESHOLD = 1.0 # seconds
|
||||||
@ -283,21 +277,10 @@ class GestureHandler(QObject):
|
|||||||
ans = (val & SIGNATURE_MASK) == MI_WP_SIGNATURE
|
ans = (val & SIGNATURE_MASK) == MI_WP_SIGNATURE
|
||||||
return ans
|
return ans
|
||||||
self.is_fake_mouse_event = is_fake_mouse_event
|
self.is_fake_mouse_event = is_fake_mouse_event
|
||||||
QApplication.instance().focusChanged.connect(self.register_for_wm_touch)
|
|
||||||
except Exception:
|
except Exception:
|
||||||
import traceback
|
import traceback
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
|
|
||||||
def register_for_wm_touch(self, *args):
|
|
||||||
if touch_supported and iswindows:
|
|
||||||
# For some reason performing certain actions like toggling the ToC
|
|
||||||
# view causes windows to stop sending WM_TOUCH events. This works
|
|
||||||
# around that bug.
|
|
||||||
# This might need to be changed for Qt 5 and effectivewinid returns
|
|
||||||
# a different kind of object.
|
|
||||||
hwnd = int(self.parent().effectiveWinId())
|
|
||||||
RegisterTouchWindow(hwnd, 0)
|
|
||||||
|
|
||||||
def __call__(self, ev):
|
def __call__(self, ev):
|
||||||
if not touch_supported:
|
if not touch_supported:
|
||||||
return False
|
return False
|
||||||
|
Loading…
x
Reference in New Issue
Block a user