diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-07-24 16:43:10 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-07-24 16:43:10 -0300 |
| commit | f22d3f3950cd84c36575686c271b7d15b4dfb683 (patch) | |
| tree | 4611dae3ee1a8a545a411a54e3174ab9feb54e30 | |
| parent | c01e87456bc5fded14778251bbd5dfe4fc4ebbd0 (diff) | |
| parent | beac7a8ce70acb17c320580538510761dff3ac93 (diff) | |
Merge remote-tracking branch 'chiiph/bug/show_hide_improved' into develop
| -rw-r--r-- | changes/bug_show_hide_improved | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug_show_hide_improved b/changes/bug_show_hide_improved new file mode 100644 index 00000000..39472074 --- /dev/null +++ b/changes/bug_show_hide_improved @@ -0,0 +1 @@ +- Improve Hide and Show Window behavior on Ubuntu. Fixes #5511.
\ No newline at end of file diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index ff19e17f..383f97bb 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -999,6 +999,12 @@ class MainWindow(QtGui.QMainWindow): if not visible: QtGui.QApplication.setQuitOnLastWindowClosed(True) self.show() + if IS_LINUX: + # On ubuntu, activateWindow doesn't work reliably, so + # we do the following as a workaround. See + # https://bugreports.qt-project.org/browse/QTBUG-24932 + # for more details + QtGui.QX11Info.setAppUserTime(0) self.activateWindow() self.raise_() else: |