revert: remove stay-on-top feature

app/actionmanager.cpp

@@ -62,7 +62,6 @@ void ActionManager::setupAction(MainWindow *mainWindow)
     CREATE_NEW_ACTION(mainWindow, actionCopyFilePath);
     CREATE_NEW_THEMEICON_ACTION(mainWindow, actionPaste, edit-paste);
     CREATE_NEW_THEMEICON_ACTION(mainWindow, actionTrash, edit-delete);
-    CREATE_NEW_ACTION(mainWindow, actionToggleStayOnTop);
     CREATE_NEW_ACTION(mainWindow, actionToggleProtectMode);
     CREATE_NEW_ACTION(mainWindow, actionToggleAvoidResetTransform);
     CREATE_NEW_ACTION(mainWindow, actionSettings);
@@ -105,7 +104,6 @@ void ActionManager::retranslateUi(MainWindow *mainWindow)
     actionCopyFilePath->setText(QCoreApplication::translate("MainWindow", "Copy &File Path", nullptr));
     actionPaste->setText(QCoreApplication::translate("MainWindow", "&Paste", nullptr));
     actionTrash->setText(QCoreApplication::translate("MainWindow", "Move to Trash", nullptr));
-    actionToggleStayOnTop->setText(QCoreApplication::translate("MainWindow", "Stay on top", nullptr));
     actionToggleProtectMode->setText(QCoreApplication::translate("MainWindow", "Protected mode", nullptr));
     actionToggleAvoidResetTransform->setText(QCoreApplication::translate("MainWindow", "Keep transformation", "The 'transformation' means the flip/rotation status that currently applied to the image view"));
     actionSettings->setText(QCoreApplication::translate("MainWindow", "Configure...", nullptr));

app/actionmanager.h

@@ -45,7 +45,6 @@ public:
     QAction *actionCopyFilePath;
     QAction *actionPaste;
     QAction *actionTrash;
-    QAction *actionToggleStayOnTop;
     QAction *actionToggleProtectMode;
     QAction *actionToggleAvoidResetTransform;
     QAction *actionSettings;

app/mainwindow.cpp

@@ -52,10 +52,6 @@ MainWindow::MainWindow(QWidget *parent)
     , m_pm(new PlaylistManager(this))
     , m_fileSystemWatcher(new QFileSystemWatcher(this))
 {
-    if (Settings::instance()->stayOnTop()) {
-        this->setWindowFlag(Qt::WindowStaysOnTopHint);
-    }
-
     this->setAttribute(Qt::WA_TranslucentBackground, true);
     this->setMinimumSize(350, 330);
     this->setWindowIcon(QIcon(u":/icons/app-icon.svg"_s));
@@ -445,10 +441,6 @@ void MainWindow::contextMenuEvent(QContextMenuEvent *event)
 
     QAction * trash = m_am->actionTrash;
 
-    QAction * stayOnTopMode = m_am->actionToggleStayOnTop;
-    stayOnTopMode->setCheckable(true);
-    stayOnTopMode->setChecked(stayOnTop());
-
     QAction * protectedMode = m_am->actionToggleProtectMode;
     protectedMode->setCheckable(true);
     protectedMode->setChecked(m_protectedMode);
@@ -483,7 +475,6 @@ void MainWindow::contextMenuEvent(QContextMenuEvent *event)
     menu->addAction(m_am->actionFitByWidth);
 #endif // 0
     menu->addSeparator();
-    menu->addAction(stayOnTopMode);
     menu->addAction(protectedMode);
     menu->addAction(avoidResetTransform);
     menu->addSeparator();
@@ -580,22 +571,11 @@ void MainWindow::toggleProtectedMode()
     updateGalleryButtonsVisibility();
 }
 
-void MainWindow::toggleStayOnTop()
-{
-    setWindowFlag(Qt::WindowStaysOnTopHint, !stayOnTop());
-    show();
-}
-
 void MainWindow::toggleAvoidResetTransform()
 {
     m_graphicsView->setAvoidResetTransform(!m_graphicsView->avoidResetTransform());
 }
 
-bool MainWindow::stayOnTop() const
-{
-    return windowFlags().testFlag(Qt::WindowStaysOnTopHint);
-}
-
 bool MainWindow::canPaste() const
 {
     const QMimeData * clipboardData = QApplication::clipboard()->mimeData();
@@ -800,11 +780,6 @@ void MainWindow::on_actionAnimationNextFrame_triggered()
     m_graphicsView->scene()->skipAnimationFrame(1);
 }
 
-void MainWindow::on_actionToggleStayOnTop_triggered()
-{
-    toggleStayOnTop();
-}
-
 void MainWindow::on_actionToggleProtectMode_triggered()
 {
     toggleProtectedMode();

app/mainwindow.h

@@ -62,9 +62,7 @@ protected slots:
     void closeWindow();
     void updateWidgetsPosition();
     void toggleProtectedMode();
-    void toggleStayOnTop();
     void toggleAvoidResetTransform();
-    bool stayOnTop() const;
     bool canPaste() const;
     void quitAppAction(bool force = false);
     void toggleFullscreen();
@@ -97,7 +95,6 @@ private slots:
     void on_actionCopyFilePath_triggered();
     void on_actionPaste_triggered();
     void on_actionTrash_triggered();
-    void on_actionToggleStayOnTop_triggered();
     void on_actionToggleProtectMode_triggered();
     void on_actionToggleAvoidResetTransform_triggered();
     void on_actionSettings_triggered();

app/settings.cpp

@@ -45,11 +45,6 @@ Settings *Settings::instance()
     return m_settings_instance;
 }
 
-bool Settings::stayOnTop() const
-{
-    return m_qsettings->value("stay_on_top", true).toBool();
-}
-
 bool Settings::useLightCheckerboard() const
 {
     return m_qsettings->value("use_light_checkerboard", false).toBool();
@@ -101,12 +96,6 @@ Qt::HighDpiScaleFactorRoundingPolicy Settings::hiDpiScaleFactorBehavior() const
     return QEnumHelper::fromString<Qt::HighDpiScaleFactorRoundingPolicy>(result, Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
 }
 
-void Settings::setStayOnTop(bool on)
-{
-    m_qsettings->setValue("stay_on_top", on);
-    m_qsettings->sync();
-}
-
 void Settings::setUseLightCheckerboard(bool light)
 {
     m_qsettings->setValue("use_light_checkerboard", light);

app/settings.h

@@ -34,7 +34,6 @@ public:
 
     static Settings *instance();
 
-    bool stayOnTop() const;
     bool useLightCheckerboard() const;
     bool loopGallery() const;
     bool svgTiny12Only() const;
@@ -43,7 +42,6 @@ public:
     WindowSizeBehavior initWindowSizeBehavior() const;
     Qt::HighDpiScaleFactorRoundingPolicy hiDpiScaleFactorBehavior() const;
 
-    void setStayOnTop(bool on);
     void setUseLightCheckerboard(bool light);
     void setLoopGallery(bool on);
     void setSvgTiny12Only(bool on);

app/settingsdialog.cpp

@@ -19,7 +19,6 @@
 
 SettingsDialog::SettingsDialog(QWidget *parent)
     : QDialog(parent)
-    , m_stayOnTop(new QCheckBox)
     , m_useLightCheckerboard(new QCheckBox)
     , m_loopGallery(new QCheckBox)
     , m_svgTiny12Only(new QCheckBox)
@@ -119,7 +118,6 @@ SettingsDialog::SettingsDialog(QWidget *parent)
         hidpiDropDown.append(hidpiOption.second);
     }
 
-    settingsForm->addRow(tr("Stay on top when start-up"), m_stayOnTop);
     settingsForm->addRow(tr("Use light-color checkerboard"), m_useLightCheckerboard);
     settingsForm->addRow(tr("Loop the loaded gallery"), m_loopGallery);
     settingsForm->addRow(tr("Limit SVG support to SVG Tiny 1.2"), m_svgTiny12Only);
@@ -128,7 +126,6 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     settingsForm->addRow(tr("Default window size"), m_initWindowSizeBehavior);
     settingsForm->addRow(tr("HiDPI scale factor rounding policy"), m_hiDpiRoundingPolicyBehavior);
 
-    m_stayOnTop->setChecked(Settings::instance()->stayOnTop());
     m_useLightCheckerboard->setChecked(Settings::instance()->useLightCheckerboard());
     m_loopGallery->setChecked(Settings::instance()->loopGallery());
     m_svgTiny12Only->setChecked(Settings::instance()->svgTiny12Only());
@@ -158,10 +155,6 @@ SettingsDialog::SettingsDialog(QWidget *parent)
 # define QT_CHECKSTATE int
 #endif // QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 
-    connect(m_stayOnTop, &QCHECKBOX_CHECKSTATECHANGED, this, [ = ](QT_CHECKSTATE state){
-        Settings::instance()->setStayOnTop(state == Qt::Checked);
-    });
-
     connect(m_useLightCheckerboard, &QCHECKBOX_CHECKSTATECHANGED, this, [ = ](QT_CHECKSTATE state){
         Settings::instance()->setUseLightCheckerboard(state == Qt::Checked);
     });

app/settingsdialog.h

@@ -22,7 +22,6 @@ signals:
 public slots:
 
 private:
-    QCheckBox * m_stayOnTop = nullptr;
     QCheckBox * m_useLightCheckerboard = nullptr;
     QCheckBox * m_loopGallery = nullptr;
     QCheckBox * m_svgTiny12Only = nullptr;