From 2486a24c90a82b06091f3f82b9bdb22a00c928b9 Mon Sep 17 00:00:00 2001 From: stojce Date: Mon, 29 Sep 2014 18:26:25 +0200 Subject: [PATCH 1/5] possible fix for Windows login and address-bar modal dialog --- interface/src/ui/AddressBarDialog.cpp | 3 +-- interface/src/ui/LoginDialog.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index 4043d5acb3..4925a43827 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -48,8 +48,7 @@ void AddressBarDialog::setupUI() { const int DIALOG_INITIAL_WIDTH = 560; setModal(true); - setWindowModality(Qt::WindowModal); - setHideOnBlur(false); + setWindowModality(Qt::ApplicationModal); QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); setSizePolicy(sizePolicy); diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp index 57e02689c1..599ff28f35 100644 --- a/interface/src/ui/LoginDialog.cpp +++ b/interface/src/ui/LoginDialog.cpp @@ -36,8 +36,7 @@ LoginDialog::LoginDialog(QWidget* parent) : _ui->errorLabel->setVisible(false); setModal(true); - setWindowModality(Qt::WindowModal); - setHideOnBlur(false); + setWindowModality(Qt::ApplicationModal); connect(&AccountManager::getInstance(), &AccountManager::loginComplete, this, &LoginDialog::handleLoginCompleted); From 9c926d9e67d1db0a35cdcecc9b8ae988c8ad98be Mon Sep 17 00:00:00 2001 From: stojce Date: Thu, 2 Oct 2014 00:17:57 +0200 Subject: [PATCH 2/5] Layout changes --- interface/src/ui/AddressBarDialog.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index 4925a43827..a1fd8b1b50 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -33,18 +33,18 @@ void AddressBarDialog::setupUI() { const int ADDRESSBAR_MIN_WIDTH = 200; const int ADDRESSBAR_MAX_WIDTH = 615; - const int ADDRESSBAR_HEIGHT = 54; + const int ADDRESSBAR_HEIGHT = 42; const int ADDRESSBAR_STRETCH = 60; - const int BUTTON_SPACER_SIZE = 10; + const int BUTTON_SPACER_SIZE = 5; const int DEFAULT_SPACER_SIZE = 20; const int ADDRESS_LAYOUT_RIGHT_MARGIN = 10; - const int GO_BUTTON_SIZE = 55; + const int GO_BUTTON_SIZE = 42; const int CLOSE_BUTTON_SIZE = 16; const QString CLOSE_BUTTON_ICON = "styles/close.svg"; - const int DIALOG_HEIGHT = 100; + const int DIALOG_HEIGHT = 62; const int DIALOG_INITIAL_WIDTH = 560; setModal(true); @@ -53,9 +53,11 @@ void AddressBarDialog::setupUI() { QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); setSizePolicy(sizePolicy); setMinimumSize(QSize(DIALOG_INITIAL_WIDTH, DIALOG_HEIGHT)); + setMaximumHeight(DIALOG_HEIGHT); setStyleSheet(DIALOG_STYLESHEET); _verticalLayout = new QVBoxLayout(this); + _verticalLayout->setContentsMargins(0, 0, 0, 0); _addressLayout = new QHBoxLayout(); _addressLayout->setContentsMargins(0, 0, ADDRESS_LAYOUT_RIGHT_MARGIN, 0); @@ -68,6 +70,7 @@ void AddressBarDialog::setupUI() { _addressLayout->addItem(_leftSpacer); _addressLineEdit = new QLineEdit(this); + _addressLineEdit->setAttribute(Qt::WA_MacShowFocusRect, 0); _addressLineEdit->setPlaceholderText(ADDRESSBAR_PLACEHOLDER); QSizePolicy sizePolicyLineEdit(QSizePolicy::Preferred, QSizePolicy::Fixed); sizePolicyLineEdit.setHorizontalStretch(ADDRESSBAR_STRETCH); @@ -117,6 +120,7 @@ void AddressBarDialog::setupUI() { void AddressBarDialog::showEvent(QShowEvent* event) { _goButton->setIcon(QIcon(Application::resourcesPath() + ADDRESSBAR_GO_BUTTON_ICON)); _addressLineEdit->setText(QString()); + _addressLineEdit->setFocus(); FramelessDialog::showEvent(event); } From 420326b2128942cecef2cb907d91cb61ac346369 Mon Sep 17 00:00:00 2001 From: stojce Date: Fri, 3 Oct 2014 14:21:05 +0200 Subject: [PATCH 3/5] Layout changes --- interface/src/ui/AddressBarDialog.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index a1fd8b1b50..e42f92d663 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -27,9 +27,7 @@ void AddressBarDialog::setupUI() { const QString DIALOG_STYLESHEET = "font-family: Helvetica, Arial, sans-serif;"; const QString ADDRESSBAR_PLACEHOLDER = "Go to: domain, @user, #location"; - const QString ADDRESSBAR_STYLESHEET = "padding: 0 10px;"; - const QString ADDRESSBAR_FONT_FAMILY = "Helvetica,Arial,sans-serif"; - const int ADDRESSBAR_FONT_SIZE = 20; + const QString ADDRESSBAR_STYLESHEET = "padding: 10px; font-size: 20px;"; const int ADDRESSBAR_MIN_WIDTH = 200; const int ADDRESSBAR_MAX_WIDTH = 615; @@ -48,7 +46,11 @@ void AddressBarDialog::setupUI() { const int DIALOG_INITIAL_WIDTH = 560; setModal(true); +#ifndef Q_OS_MAC setWindowModality(Qt::ApplicationModal); +#else + setWindowModality(Qt::WindowModal); +#endif QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); setSizePolicy(sizePolicy); @@ -77,8 +79,6 @@ void AddressBarDialog::setupUI() { _addressLineEdit->setSizePolicy(sizePolicyLineEdit); _addressLineEdit->setMinimumSize(QSize(ADDRESSBAR_MIN_WIDTH, ADDRESSBAR_HEIGHT)); _addressLineEdit->setMaximumSize(QSize(ADDRESSBAR_MAX_WIDTH, ADDRESSBAR_HEIGHT)); - QFont font(ADDRESSBAR_FONT_FAMILY, ADDRESSBAR_FONT_SIZE); - _addressLineEdit->setFont(font); _addressLineEdit->setStyleSheet(ADDRESSBAR_STYLESHEET); _addressLayout->addWidget(_addressLineEdit); From 429ddd71159a7392ca3d708578dd142a2699c1d1 Mon Sep 17 00:00:00 2001 From: stojce Date: Fri, 3 Oct 2014 14:30:03 +0200 Subject: [PATCH 4/5] address bar style fix --- interface/src/ui/AddressBarDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index e42f92d663..d537872fcd 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -27,7 +27,7 @@ void AddressBarDialog::setupUI() { const QString DIALOG_STYLESHEET = "font-family: Helvetica, Arial, sans-serif;"; const QString ADDRESSBAR_PLACEHOLDER = "Go to: domain, @user, #location"; - const QString ADDRESSBAR_STYLESHEET = "padding: 10px; font-size: 20px;"; + const QString ADDRESSBAR_STYLESHEET = "padding: 5px 10px; font-size: 20px;"; const int ADDRESSBAR_MIN_WIDTH = 200; const int ADDRESSBAR_MAX_WIDTH = 615; From a1d3e3289c9e913b70029a3118a353608f6fc402 Mon Sep 17 00:00:00 2001 From: stojce Date: Fri, 3 Oct 2014 14:51:29 +0200 Subject: [PATCH 5/5] close icon size fix --- interface/src/ui/AddressBarDialog.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index d537872fcd..26505af0be 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -108,6 +108,7 @@ void AddressBarDialog::setupUI() { _closeButton->setMaximumSize(QSize(CLOSE_BUTTON_SIZE, CLOSE_BUTTON_SIZE)); QIcon icon(Application::resourcesPath() + CLOSE_BUTTON_ICON); _closeButton->setIcon(icon); + _closeButton->setIconSize(QSize(CLOSE_BUTTON_SIZE, CLOSE_BUTTON_SIZE)); _closeButton->setFlat(true); _addressLayout->addWidget(_closeButton, 0, Qt::AlignRight);