From fc566d9823074f5a30a74f70f2ec3f0e1764ef04 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 3 Dec 2013 16:44:59 +0530 Subject: [PATCH] ... --- src/calibre/gui2/tweak_book/editor/image.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/tweak_book/editor/image.py b/src/calibre/gui2/tweak_book/editor/image.py index 77ddd9ae42..3ae127e724 100644 --- a/src/calibre/gui2/tweak_book/editor/image.py +++ b/src/calibre/gui2/tweak_book/editor/image.py @@ -140,7 +140,7 @@ class Canvas(QWidget): def move_selection(self, dp): sr = self.selection_state.rect dm = self.selection_state.dragging - if dm == (None, None): + if dm is None: half_width = sr.width() / 2.0 half_height = sr.height() / 2.0 c = sr.center() @@ -184,11 +184,11 @@ class Canvas(QWidget): if not self.target.contains(pos): return if ev.buttons() & Qt.LeftButton: - if self.selection_state.last_press_point is not None: + if self.selection_state.last_press_point is not None and self.selection_state.current_mode is not None: if self.selection_state.current_mode == 'select': self.selection_state.rect = QRectF(self.selection_state.last_press_point, pos).normalized() changed = True - elif self.selection_state.dragging is not None and self.selection_state.last_drag_pos is not None: + elif self.selection_state.last_drag_pos is not None: self.selection_state.in_selection = True self.selection_state.drag_corner = self.selection_state.dragging dp = pos - self.selection_state.last_drag_pos