Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-31 14:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

More PyQt6 nonsense

Browse Source
This commit is contained in:
Kovid Goyal 2021-12-16 08:14:38 +05:30
parent ab2b26ddf0
commit 5749582c9b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/gui2/tweak_book/editor/canvas.py
View File

@ -506,8 +506,8 @@ class Canvas(QWidget):
return get_selection_rect(img, sr, target) return get_selection_rect(img, sr, target)
def mousePressEvent(self, ev): def mousePressEvent(self, ev):
if ev.button() == Qt.MouseButton.LeftButton and self.target.contains(ev.pos()): if ev.button() == Qt.MouseButton.LeftButton and self.target.contains(ev.position()):
pos = ev.pos() pos = ev.position()
self.selection_state.last_press_point = pos self.selection_state.last_press_point = pos
if self.selection_state.current_mode is None: if self.selection_state.current_mode is None:
self.selection_state.current_mode = 'select' self.selection_state.current_mode = 'select'
@ -528,7 +528,7 @@ class Canvas(QWidget):
changed = True changed = True
self.selection_state.in_selection = False self.selection_state.in_selection = False
self.selection_state.drag_corner = None self.selection_state.drag_corner = None
pos = ev.pos() pos = ev.position()
cursor = Qt.CursorShape.ArrowCursor cursor = Qt.CursorShape.ArrowCursor
try: try:
if ev.buttons() & Qt.MouseButton.LeftButton: if ev.buttons() & Qt.MouseButton.LeftButton:
@ -545,10 +545,10 @@ class Canvas(QWidget):
cursor = self.get_cursor() cursor = self.get_cursor()
changed = True changed = True
else: else:
if not self.target.contains(pos) or self.selection_state.rect is None or not self.selection_state.rect.contains(pos): if not self.target.contains(QPointF(pos)) or self.selection_state.rect is None or not self.selection_state.rect.contains(QPointF(pos)):
return return
if self.selection_state.current_mode == 'selected': if self.selection_state.current_mode == 'selected':
if self.selection_state.rect is not None and self.selection_state.rect.contains(pos): if self.selection_state.rect is not None and self.selection_state.rect.contains(QPointF(pos)):
self.selection_state.drag_corner = self.get_drag_corner(pos) self.selection_state.drag_corner = self.get_drag_corner(pos)
self.selection_state.in_selection = True self.selection_state.in_selection = True
cursor = self.get_cursor() cursor = self.get_cursor()
@ -568,7 +568,8 @@ class Canvas(QWidget):
else: else:
self.selection_state.current_mode = 'selected' self.selection_state.current_mode = 'selected'
self.selection_state_changed.emit(self.has_selection) self.selection_state_changed.emit(self.has_selection)
elif self.selection_state.current_mode == 'selected' and self.selection_state.rect is not None and self.selection_state.rect.contains(ev.pos()): elif self.selection_state.current_mode == 'selected' and self.selection_state.rect is not None and self.selection_state.rect.contains(
ev.position()):
self.setCursor(self.get_cursor()) self.setCursor(self.get_cursor())
self.update() self.update()