summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-08-05 17:12:27 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-08-05 17:12:27 -0300
commite95351d812d98b4be6e1e3dafd6855804d95267a (patch)
tree18ce6a5052cc74e6dd8170d4c1937f1af645f47a
parent733ebec5f654580b4ed9cbcd767480b2f2c92984 (diff)
parentfc74c77101d5210db1b9bdd02b460747d24016da (diff)
Merge remote-tracking branch 'chiiph/bug/raise_when_visible' into develop
-rw-r--r--changes/bug_always_raise_when_visible1
-rw-r--r--src/leap/gui/mainwindow.py6
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug_always_raise_when_visible b/changes/bug_always_raise_when_visible
new file mode 100644
index 00000000..21610bf2
--- /dev/null
+++ b/changes/bug_always_raise_when_visible
@@ -0,0 +1 @@
+ o Raise window when setting it as visible. Fixes #3374 \ No newline at end of file
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 1c1236af..89790239 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -603,7 +603,11 @@ class MainWindow(QtGui.QMainWindow):
Toggles the window visibility
"""
- self.setVisible(not self.isVisible())
+ if not self.isVisible():
+ self.show()
+ self.raise_()
+ else:
+ self.hide()
def _center_window(self):
"""