diff options
| -rw-r--r-- | Swift/QtUI/QtLoginWindow.cpp | 5 | ||||
| -rw-r--r-- | Swift/QtUI/QtLoginWindow.h | 1 | ||||
| -rw-r--r-- | Swift/QtUI/QtRosterHeader.cpp | 2 | 
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); | 
 Swift
 Swift