From d6630f7ff66cf344c31d307b39641fc5ca7a228e Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 3 Mar 2021 09:47:38 +0100 Subject: [PATCH] fix #371 --- resources/desktop/com.github.rssguard.appdata.xml | 2 +- src/librssguard/gui/dialogs/formmain.cpp | 2 +- src/librssguard/gui/dialogs/formmain.h | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index fcee471f6..16f1a3c46 100644 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -30,7 +30,7 @@ https://martinrotter.github.io/donate/ - + none diff --git a/src/librssguard/gui/dialogs/formmain.cpp b/src/librssguard/gui/dialogs/formmain.cpp index cf0639240..37c4d0555 100755 --- a/src/librssguard/gui/dialogs/formmain.cpp +++ b/src/librssguard/gui/dialogs/formmain.cpp @@ -464,7 +464,7 @@ void FormMain::switchVisibility(bool force_hide) { void FormMain::display() { // Make sure window is not minimized. - setWindowState(windowState() & ~Qt::WindowMinimized& ~Qt::WindowActive); + showNormal(); // Display the window and make sure it is raised on top. show(); diff --git a/src/librssguard/gui/dialogs/formmain.h b/src/librssguard/gui/dialogs/formmain.h index 3caadd3ea..18bd40a51 100644 --- a/src/librssguard/gui/dialogs/formmain.h +++ b/src/librssguard/gui/dialogs/formmain.h @@ -39,16 +39,9 @@ class RSSGUARD_DLLSPEC FormMain : public QMainWindow { void saveSize(); public slots: - - // Displays window on top or switches its visibility. void display(); - - // Switches visibility of main window. void switchVisibility(bool force_hide = false); - - // Turns on/off fullscreen mode void switchFullscreenMode(); - void showAddAccountDialog(); private slots: