diff options
author | Remko Tronçon <git@el-tramo.be> | 2010-12-12 19:39:54 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2010-12-12 19:39:54 (GMT) |
commit | 3a2e16b04ceaa5db4c385cf55760b55f6af7c663 (patch) | |
tree | 8f5d50e3c42d0e5680b0ce1c5f4bcb73443f6e3f /Swift/QtUI/QtLoginWindow.cpp | |
parent | 683e1c1079cf3e288b3f87faf83188c2f83464b3 (diff) | |
download | swift-contrib-3a2e16b04ceaa5db4c385cf55760b55f6af7c663.zip swift-contrib-3a2e16b04ceaa5db4c385cf55760b55f6af7c663.tar.bz2 |
Don't hide the roster when clicking the system tray on OS X.
Diffstat (limited to 'Swift/QtUI/QtLoginWindow.cpp')
-rw-r--r-- | Swift/QtUI/QtLoginWindow.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp index 4bf5691..72c68b5 100644 --- a/Swift/QtUI/QtLoginWindow.cpp +++ b/Swift/QtUI/QtLoginWindow.cpp @@ -21,6 +21,7 @@ #include <QMenuBar> #include <QHBoxLayout> #include <qdebug.h> +#include <QCloseEvent> #include "Swift/Controllers/UIEvents/UIEventStream.h" #include "Swift/Controllers/UIEvents/RequestXMLConsoleUIEvent.h" @@ -374,7 +375,10 @@ void QtLoginWindow::bringToFront() { window()->activateWindow(); } else { +#ifndef Q_WS_MAC + // FIXME: Remove this when we can bring the window back to the front using the dock on OS X window()->hide(); +#endif } } @@ -386,5 +390,4 @@ void QtLoginWindow::moveEvent(QMoveEvent*) { emit geometryChanged(); } - } |