From 6faea2b5a72492a6a0b46e65e28f30963704bddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Wed, 23 May 2018 17:24:04 +0200 Subject: [PATCH] Disabled minimize to system tray for now. App icon needs some work to look ok in Windows 10 system tray and macos is not ready yet to fully support this. --- YACReaderLibrary/library_window.cpp | 15 +++++++++------ YACReaderLibrary/library_window.h | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index 3af8e8d0..b1d34487 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -139,11 +139,13 @@ void LibraryWindow::setupUI() else //if(settings->value(USE_OPEN_GL).toBool() == false) showMaximized(); - - trayIcon.setIcon(QApplication::windowIcon()); - trayIcon.show(); - connect(&trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), - this, SLOT(trayActivation(QSystemTrayIcon::ActivationReason))); +} + /* //disabled until icons are ready and macos native code is done + trayIcon.setIcon(QApplication::windowIcon()); + trayIcon.show(); + connect(&trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), + this, SLOT(trayActivation(QSystemTrayIcon::ActivationReason))); + } } void LibraryWindow::trayActivation(QSystemTrayIcon::ActivationReason reason) @@ -157,6 +159,7 @@ void LibraryWindow::trayActivation(QSystemTrayIcon::ActivationReason reason) } } + void LibraryWindow::changeEvent(QEvent *event) { if (event->type() == QEvent::WindowStateChange && isMinimized()) @@ -167,7 +170,7 @@ void LibraryWindow::changeEvent(QEvent *event) { QMainWindow::changeEvent(event); } -} +}*/ void LibraryWindow::doLayout() { diff --git a/YACReaderLibrary/library_window.h b/YACReaderLibrary/library_window.h index 3d27fe24..908eaa4c 100644 --- a/YACReaderLibrary/library_window.h +++ b/YACReaderLibrary/library_window.h @@ -385,7 +385,7 @@ public slots: void checkMaxNumLibraries(); void showErrorUpgradingLibrary(const QString & path); - void changeEvent(QEvent *event); + //void changeEvent(QEvent *event); private: //fullscreen mode in Windows for preventing this bug: QTBUG-41309 https://bugreports.qt.io/browse/QTBUG-41309 @@ -396,7 +396,7 @@ private: QSystemTrayIcon trayIcon; private slots: - void trayActivation(QSystemTrayIcon::ActivationReason reason); + //void trayActivation(QSystemTrayIcon::ActivationReason reason); }; #endif