From c74efdaa9bcd9ec1317e5d3db8097f09cdc574d4 Mon Sep 17 00:00:00 2001 From: pokamest Date: Wed, 24 Feb 2021 13:41:32 -0800 Subject: [PATCH] ui fix for macos --- client/ui/mainwindow.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/client/ui/mainwindow.cpp b/client/ui/mainwindow.cpp index 9a91d170..b5ccc81f 100644 --- a/client/ui/mainwindow.cpp +++ b/client/ui/mainwindow.cpp @@ -45,6 +45,7 @@ MainWindow::MainWindow(QWidget *parent) : #ifdef Q_OS_MAC ui->widget_tittlebar->hide(); + resize(width(), height() - ui->stackedWidget_main->y()); ui->stackedWidget_main->move(0,0); fixWidget(this); #endif @@ -465,9 +466,11 @@ void MainWindow::onPushButtonConnectClicked(bool checked) void MainWindow::setupTray() { m_menu = new QMenu(); - //m_menu->setStyleSheet(styleSheet()); - m_menu->addAction(QIcon(":/images/tray/application.png"), tr("Show") + " " + APPLICATION_NAME, this, SLOT(show())); + m_menu->addAction(QIcon(":/images/tray/application.png"), tr("Show") + " " + APPLICATION_NAME, this, [this](){ + show(); + raise(); + }); m_menu->addSeparator(); m_trayActionConnect = m_menu->addAction(tr("Connect"), this, SLOT(onConnect())); m_trayActionDisconnect = m_menu->addAction(tr("Disconnect"), this, SLOT(onDisconnect()));