From 3a2e16b04ceaa5db4c385cf55760b55f6af7c663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sun, 12 Dec 2010 20:39:54 +0100
Subject: Don't hide the roster when clicking the system tray on OS X.


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);
-- 
cgit v0.10.2-6-g49f6