summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-12-12 19:39:54 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-12-12 19:39:54 (GMT)
commit3a2e16b04ceaa5db4c385cf55760b55f6af7c663 (patch)
tree8f5d50e3c42d0e5680b0ce1c5f4bcb73443f6e3f /Swift/QtUI
parent683e1c1079cf3e288b3f87faf83188c2f83464b3 (diff)
downloadswift-3a2e16b04ceaa5db4c385cf55760b55f6af7c663.zip
swift-3a2e16b04ceaa5db4c385cf55760b55f6af7c663.tar.bz2
Don't hide the roster when clicking the system tray on OS X.
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/QtLoginWindow.cpp5
-rw-r--r--Swift/QtUI/QtLoginWindow.h1
-rw-r--r--Swift/QtUI/QtRosterHeader.cpp2
3 files changed, 6 insertions, 2 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();
}
-
}
diff --git a/Swift/QtUI/QtLoginWindow.h b/Swift/QtUI/QtLoginWindow.h
index 242b5b4..e87c5f1 100644
--- a/Swift/QtUI/QtLoginWindow.h
+++ b/Swift/QtUI/QtLoginWindow.h
@@ -39,6 +39,7 @@ namespace Swift {
static QRect defaultPosition();
void setGentleGeometry(const QRect&);
void selectUser(const String& user);
+
virtual void quit();
signals:
diff --git a/Swift/QtUI/QtRosterHeader.cpp b/Swift/QtUI/QtRosterHeader.cpp
index 5aeaa5d..855c861 100644
--- a/Swift/QtUI/QtRosterHeader.cpp
+++ b/Swift/QtUI/QtRosterHeader.cpp
@@ -20,7 +20,7 @@
namespace Swift {
QtRosterHeader::QtRosterHeader(QtSettingsProvider* settings, QWidget* parent) : QWidget(parent) {
QHBoxLayout* topLayout = new QHBoxLayout();
- topLayout->setSpacing(0);
+ topLayout->setSpacing(3);
topLayout->setContentsMargins(4,4,4,4);
setLayout(topLayout);
setMinimumHeight(50);