fix(macOS): hide dock icon when closing settings with ⌘+W

src/gui/settingsdialog.cpp

@@ -50,7 +50,7 @@
 
     [[nodiscard]] QSize sizeHint() const override
     {
         if (const auto *widget = currentWidget()) {
             return widget->sizeHint();
         }
         return QStackedWidget::sizeHint();
@@ -58,7 +58,7 @@
 
     [[nodiscard]] QSize minimumSizeHint() const override
     {
         if (const auto *widget = currentWidget()) {
             return widget->minimumSizeHint();
         }
         return QStackedWidget::minimumSizeHint();
@@ -66,15 +66,15 @@
 
     [[nodiscard]] bool hasHeightForWidth() const override
     {
         if (const auto *widget = currentWidget()) {
             return widget->hasHeightForWidth();
         }
         return QStackedWidget::hasHeightForWidth();
     }
 
     [[nodiscard]] int heightForWidth(int width) const override
     {
         if (const auto *widget = currentWidget()) {
             return widget->hasHeightForWidth() ? widget->heightForWidth(width) : widget->sizeHint().height();
         }
         return QStackedWidget::heightForWidth(width);
@@ -89,7 +89,7 @@
     "QToolBar QToolButton:checked { background: palette(highlight); color: palette(highlighted-text); }"
 );
 
 const float buttonSizeRatio = 1.618f; // golden ratio
 
 
 /** display name with two lines that is displayed in the settings
@@ -123,10 +123,10 @@
     using QWidget::QWidget;
 
 protected:
     void mousePressEvent(QMouseEvent *event) override
     {
         if (event->button() == Qt::LeftButton) {
             if (const auto *window = this->window(); window && window->windowHandle()) {
                 window->windowHandle()->startSystemMove();
                 event->accept();
                 return;
@@ -153,7 +153,7 @@
     // People perceive this as a Window, so also make Ctrl+W work
     auto *closeWindowAction = new QAction(this);
     closeWindowAction->setShortcut(QKeySequence("Ctrl+W"));
-    connect(closeWindowAction, &QAction::triggered, this, &SettingsDialog::accept);
+    connect(closeWindowAction, &QAction::triggered, this, &SettingsDialog::close);
     addAction(closeWindowAction);
 
     setObjectName("Settings"); // required as group for saveGeometry call
@@ -174,7 +174,7 @@
     QAction *generalAction = createColorAwareAction(QLatin1String(":/client/theme/settings.svg"), tr("General"));
     _actionGroup->addAction(generalAction);
     _toolBar->addAction(generalAction);
     auto *accountSpacer = new QWidget(this);
     accountSpacer->setFixedHeight(16);
     _toolBar->addWidget(accountSpacer);
     _toolBar->addSeparator();
@@ -219,7 +219,7 @@
     cfg.restoreGeometry(this);
 }
 
 SettingsDialog::~SettingsDialog()
 {
 }
 
@@ -229,7 +229,7 @@
 }
 
 // close event is not being called here
 void SettingsDialog::resizeEvent(QResizeEvent *event)
 {
     QDialog::resizeEvent(event);
 
@@ -281,7 +281,7 @@
 {
     _stack->setCurrentWidget(_actionGroupWidgets.value(action));
     _stack->updateGeometry();
     if (auto *contentContainer = _stack->parentWidget()) {
         contentContainer->updateGeometry();
     }
 }
@@ -350,14 +350,14 @@
 
 void SettingsDialog::slotAccountAvatarChanged()
 {
     auto *account = dynamic_cast<Account *>(sender());
     if (!account) {
         return;
     }
     updateAccountAvatar(account);
 }
 
 void SettingsDialog::updateAccountAvatar(const Account *account)
 {
     if (!account || !_actionForAccount.contains(account)) {
         return;
@@ -427,19 +427,19 @@
         return;
     }
 
     const QScopedValueRollback<bool> updatingStyle(_updatingStyle, true);
     _toolBar->setStyleSheet(TOOLBAR_CSS);
 
     setStyleSheet(QStringLiteral(
         "#Settings { background: palette(window); border-radius: 0; }"
 
         /* Navigation */
         "#settings_navigation, #settings_navigation_scroll { background: palette(alternate-base); border-radius: 12px; padding: 4px; }"
 
         /* Content area */
         "#settings_content, #settings_content_scroll { background: palette(window); border-radius: 12px; }"
 
         /* Panels */
         "#generalGroupBox, #advancedGroupBox, #aboutAndUpdatesGroupBox,"
         "#accountStatusPanel, #connectionSettingsPanel, #fileProviderPanel, #syncFoldersPanel {"
         " background: palette(alternate-base);"
@@ -515,7 +515,7 @@
     setWindowTitle(tr("Settings"));
     setGeometry(0, 0, 950, 500);
 
     auto *mainLayout = new QHBoxLayout(this);
     mainLayout->setContentsMargins(12, 12, 12, 12);
     mainLayout->setSpacing(12);
     setLayout(mainLayout);
@@ -528,17 +528,17 @@
     _toolBar->setMinimumWidth(220);
     _toolBar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
 
     auto *navigationContainer = new QWidget(this);
     navigationContainer->setObjectName("settings_navigation"_L1);
     navigationContainer->setAttribute(Qt::WA_StyledBackground);
 
     auto *navigationLayout = new QVBoxLayout(navigationContainer);
     navigationLayout->setContentsMargins(0, 0, 0, 0);
     navigationLayout->setSpacing(0);
     navigationLayout->addWidget(_toolBar);
     navigationLayout->addStretch(1);
 
     auto *navigationScroll = new QScrollArea(this);
     navigationScroll->setObjectName("settings_navigation_scroll"_L1);
     navigationScroll->setWidgetResizable(true);
     navigationScroll->setAlignment(Qt::AlignTop | Qt::AlignLeft);
@@ -548,10 +548,10 @@
     navigationScroll->viewport()->setAutoFillBackground(false);
     navigationScroll->setWidget(navigationContainer);
 
     _stack = new CurrentPageSizeStackedWidget(this);
     _stack->setObjectName(u"settings_content"_s);
 
     auto *contentScroll = new QScrollArea(this);
     contentScroll->setObjectName("settings_content_scroll"_L1);
     contentScroll->setWidgetResizable(true);
     contentScroll->setAlignment(Qt::AlignTop | Qt::AlignLeft);