fix: show previous tray window instead of popup menu when opening issues list

src/gui/settingsdialog.cpp

@@ -60,7 +60,7 @@
     #define BACKGROUND_PALETTE "alternate-base"
 #else
     // ...and "alternate-base" looks too bright on macOS only.  On Linux/Plasma either one looked fine ...
     #define BACKGROUND_PALETTE "light"
 #endif
 
 namespace {
@@ -71,7 +71,7 @@
 
     [[nodiscard]] QSize sizeHint() const override
     {
         if (const auto *widget = currentWidget()) {
             return widget->sizeHint();
         }
         return QStackedWidget::sizeHint();
@@ -79,7 +79,7 @@
 
     [[nodiscard]] QSize minimumSizeHint() const override
     {
         if (const auto *widget = currentWidget()) {
             return widget->minimumSizeHint();
         }
         return QStackedWidget::minimumSizeHint();
@@ -87,15 +87,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);
@@ -110,10 +110,10 @@
     "QToolBar QToolButton:checked { background: palette(highlight); color: palette(highlighted-text); }"
 );
 
 const float buttonSizeRatio = 1.618f; // golden ratio
 constexpr auto settingsDialogDefaultWidth = 950;
 constexpr auto settingsDialogDefaultHeight = 500;
 const auto settingsNavigationIconTextSpacing = QLatin1String("  ");
 
 /** display name with two lines that is displayed in the settings
  * If width is bigger than 0, the string will be ellided so it does not exceed that width
@@ -176,7 +176,7 @@
         accountAdded(account.data());
     }
 
     auto *accountSpacer = new QWidget(this);
     accountSpacer->setFixedHeight(16);
     _firstNonAccountAction = _toolBar->addWidget(accountSpacer);
 
@@ -216,7 +216,7 @@
     cfg.restoreGeometry(this);
 }
 
 SettingsDialog::~SettingsDialog()
 {
 }
 
@@ -239,7 +239,7 @@
     QDialog::accept();
 }
 
 void SettingsDialog::showEvent(QShowEvent *event)
 {
     QDialog::showEvent(event);
 
@@ -258,7 +258,7 @@
     switch (e->type()) {
     case QEvent::StyleChange:
     case QEvent::PaletteChange:
     case QEvent::ThemeChange:
         customizeStyle();
 
         // Notify the other widgets (Dark-/Light-Mode switching)
@@ -285,7 +285,7 @@
 {
     _stack->setCurrentWidget(_actionGroupWidgets.value(action));
     _stack->updateGeometry();
     if (auto *contentContainer = _stack->parentWidget()) {
         contentContainer->updateGeometry();
     }
 }
@@ -298,7 +298,7 @@
         return;
     }
     const QList<QAction *> actions = _toolBar->actions();
     for (auto *action : actions) {
         if (_actionGroupWidgets.contains(action)) {
             action->trigger();
             return;
@@ -306,14 +306,14 @@
     }
 }
 
 void SettingsDialog::setInitialAccount(AccountState *account)
 {
     _initialAccount = account;
 }
 
 void SettingsDialog::showAccount(AccountState *account)
 {
     auto *action = _actionForAccount.value(account->account().data());
     if (action) {
         action->trigger();
     }
@@ -324,7 +324,7 @@
     const auto userModel = UserModel::instance();
     const auto id = userModel->findUserIdForAccount(account);
     UserModel::instance()->setCurrentUserId(id);
-    Systray::instance()->showWindow();
+    Systray::instance()->showQMLWindow();
 }
 
 void SettingsDialog::accountAdded(AccountState *s)
@@ -379,14 +379,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;
@@ -450,9 +450,9 @@
     }
 }
 
 void SettingsDialog::addSettingsPage(const QString &iconPath, const QString &title, QWidget *settingsPage, [[maybe_unused]] bool updateChannelAware)
 {
     auto *settingsAction = createColorAwareAction(iconPath, title);
     _actionGroup->addAction(settingsAction);
     _toolBar->addAction(settingsAction);
 
@@ -461,11 +461,11 @@
     settingsPage->setObjectName(objectName);
     _stack->addWidget(settingsPage);
 
     if (auto *generalSettingsPage = qobject_cast<GeneralSettings *>(settingsPage)) {
         connect(this, &SettingsDialog::styleChanged, generalSettingsPage, &GeneralSettings::slotStyleChanged);
     } else if (auto *advancedSettingsPage = qobject_cast<AdvancedSettings *>(settingsPage)) {
         connect(this, &SettingsDialog::styleChanged, advancedSettingsPage, &AdvancedSettings::slotStyleChanged);
     } else if (auto *infoSettingsPage = qobject_cast<InfoSettings *>(settingsPage)) {
         connect(this, &SettingsDialog::styleChanged, infoSettingsPage, &InfoSettings::slotStyleChanged);
 
 #if defined(BUILD_UPDATER)
@@ -486,7 +486,7 @@
         return;
     }
 
     const QScopedValueRollback<bool> updatingStyle(_updatingStyle, true);
     _toolBar->setStyleSheet(TOOLBAR_CSS);
 
     auto separatorColor = palette().color(QPalette::Mid);
@@ -500,14 +500,14 @@
     setStyleSheet(QStringLiteral(
         "#Settings { background: palette(window); border-radius: 0; }"
 
         /* Navigation */
         "#settings_navigation_scroll { background: palette(" BACKGROUND_PALETTE "); border-radius: 12px; padding: 4px; }"
         "#settings_navigation { background: transparent; border: none; padding: 0px; }"
 
         /* Content area */
         "#settings_content, #settings_content_scroll { background: palette(window); border-radius: 12px; }"
 
         /* Panels */
         "#generalGroupBox, #notificationsGroupBox, #advancedGroupBox, #syncBehaviorGroupBox,"
         "#advancedActionsGroupBox, #aboutAndUpdatesGroupBox, #updatesGroupBox {"
         " background: palette(" BACKGROUND_PALETTE ");"
@@ -581,7 +581,7 @@
             using QToolButton::QToolButton;
 
         protected:
             void paintEvent(QPaintEvent *event) override
             {
                 Q_UNUSED(event)
 
@@ -593,7 +593,7 @@
             }
 
         private:
             void initStyleOption(QStyleOptionToolButton *option) const override
             {
                 QToolButton::initStyleOption(option);
                 if (!option->text.isEmpty()) {
@@ -603,7 +603,7 @@
             }
         };
 
         auto *btn = new SettingsNavigationButton(parent);
         QString objectName = QLatin1String("settingsdialog_toolbutton_");
         objectName += text();
         btn->setObjectName(objectName);
@@ -638,7 +638,7 @@
     setGeometry(0, 0, settingsDialogDefaultWidth, settingsDialogDefaultHeight);
     setMinimumSize(settingsDialogDefaultWidth, settingsDialogDefaultHeight);
 
     auto *mainLayout = new QHBoxLayout(this);
     mainLayout->setContentsMargins(12, 12, 12, 12);
     mainLayout->setSpacing(12);
     setLayout(mainLayout);
@@ -651,17 +651,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);
@@ -674,7 +674,7 @@
     _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);