From 511e4a6ac081d1c851a5209e7b33f381a06b2249 Mon Sep 17 00:00:00 2001 From: BOTFritz <31308787+BOTFritz@users.noreply.github.com> Date: Tue, 29 Aug 2017 03:34:49 +0000 Subject: [PATCH] Fixed scroll zoom on nonprimary monitor or in small window --- labelImg.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/labelImg.py b/labelImg.py index 130dbd69..c7a71a3a 100755 --- a/labelImg.py +++ b/labelImg.py @@ -815,9 +815,10 @@ class MainWindow(QMainWindow, WindowMixin): # up and down analogous cursor = QCursor() pos = cursor.pos() + relative_pos = QWidget.mapFromGlobal(self, pos) - cursor_x = pos.x() - cursor_y = pos.y() + cursor_x = relative_pos.x() + cursor_y = relative_pos.y() w = self.scrollArea.width() h = self.scrollArea.height() @@ -828,7 +829,7 @@ class MainWindow(QMainWindow, WindowMixin): move_x = (cursor_x - margin * w) / (w - 2 * margin * w) move_y = (cursor_y - margin * h) / (h - 2 * margin * h) - # clamp the values form 0 to 1 + # clamp the values from 0 to 1 move_x = min(max(move_x, 0), 1) move_y = min(max(move_y, 0), 1)