fix: hide dock icon when close to minitray

Change-Id: Ice4bf9369faa4f2b39087e8f0c4d2f89bf11d7e8
linuxdeepin · Mar 2, 2018 · 1845992 · 1845992
1 parent 7ce74ff
commit 1845992
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/music-player/presenter/presenter.cpp b/music-player/presenter/presenter.cpp
@@ -157,8 +157,6 @@ Presenter::~Presenter()
 void Presenter::handleQuit()
 {
     Q_D(Presenter);
-    qDebug() << "handleQuit";
-
     d->settings->setOption("base.play.last_position", d->lastPlayPosition);
     d->player->stop();
 }

diff --git a/music-player/view/mainframe.cpp b/music-player/view/mainframe.cpp
@@ -608,15 +608,18 @@ void MainFrame::postInitUI()
     connect(trayIcon, &QSystemTrayIcon::activated,
     this, [ = ](QSystemTrayIcon::ActivationReason reason) {
         if (QSystemTrayIcon::Trigger == reason) {
-            if (isMinimized()) {
-                showNormal();
+            if (isVisible()) {
+                if (isMinimized()) {
+                    showNormal();
+                    // when window flags changed, should call hide() and show()
+                    hide();
+                    show();
+                } else {
+                    showMinimized();
+                }
             } else {
-                showMinimized();
+                showNormal();
             }
-
-            // when window flags changed, should can hide and show
-            hide();
-            show();
         }
     });
 }
@@ -1131,12 +1134,8 @@ void MainFrame::closeEvent(QCloseEvent *event)
         MusicSettings::setOption("base.play.state", int(windowState()));
         MusicSettings::setOption("base.play.geometry", saveGeometry());
         DMainWindow::closeEvent(event);
-    } else {
-        event->ignore();
-        showMinimized();
-        hide();
-        show();
     }
+    DMainWindow::closeEvent(event);
 }
 
 void MainFrame::paintEvent(QPaintEvent *e)