summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-03 18:44:21 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-03 18:48:46 -0300
commit1f36c21ca532e39ef80b4a27f79bcad66ed335b2 (patch)
treecf7e5c538532b830c682f583fcc0958528d7491c
parenta8c9810f5a90578c4dcce2f519e4d89be068f71a (diff)
Allow window minization in OSX
-rw-r--r--changes/properly_minimize_osx1
-rw-r--r--src/leap/bitmask/gui/mainwindow.py7
2 files changed, 5 insertions, 3 deletions
diff --git a/changes/properly_minimize_osx b/changes/properly_minimize_osx
new file mode 100644
index 00000000..c3e5a3ef
--- /dev/null
+++ b/changes/properly_minimize_osx
@@ -0,0 +1 @@
+ o Allow window minization on OSX. Fixes #3932. \ No newline at end of file
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index dd4a341e..79ff68c4 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -766,9 +766,10 @@ class MainWindow(QtGui.QMainWindow):
"""
Reimplements the changeEvent method to minimize to tray
"""
- if QtGui.QSystemTrayIcon.isSystemTrayAvailable() and \
- e.type() == QtCore.QEvent.WindowStateChange and \
- self.isMinimized():
+ if not IS_MAC and \
+ QtGui.QSystemTrayIcon.isSystemTrayAvailable() and \
+ e.type() == QtCore.QEvent.WindowStateChange and \
+ self.isMinimized():
self._toggle_visible()
e.accept()
return