apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #152 from BOTFritz/master

Browse Source 
Fixed scroll zoom on nonprimary monitor or in small window
This commit is contained in:
darrenl 2017-08-29 12:20:39 +08:00 committed by GitHub
commit b40edc3ab3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
labelImg.py
View File

@ -815,9 +815,10 @@ class MainWindow(QMainWindow, WindowMixin):
# up and down analogous # up and down analogous
cursor = QCursor() cursor = QCursor()
pos = cursor.pos() pos = cursor.pos()
relative_pos = QWidget.mapFromGlobal(self, pos)
cursor_x = pos.x() cursor_x = relative_pos.x()
cursor_y = pos.y() cursor_y = relative_pos.y()
w = self.scrollArea.width() w = self.scrollArea.width()
h = self.scrollArea.height() h = self.scrollArea.height()
@ -828,7 +829,7 @@ class MainWindow(QMainWindow, WindowMixin):
move_x = (cursor_x - margin * w) / (w - 2 * margin * w) move_x = (cursor_x - margin * w) / (w - 2 * margin * w)
move_y = (cursor_y - margin * h) / (h - 2 * margin * h) 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_x = min(max(move_x, 0), 1)
move_y = min(max(move_y, 0), 1) move_y = min(max(move_y, 0), 1)