Cleanup set focus on window

yakimka · Sep 29, 2020 · 321a454 · 321a454
1 parent 92a7057
commit 321a454
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/CherryTomato/main.py b/CherryTomato/main.py
@@ -31,8 +31,7 @@ def setTrayIcon(app, mainWindow):
     quitAction.triggered.connect(app.quit)
     menu.addAction(quitAction)
 
-    trayIcon.activated.connect(mainWindow.showNormal)
-    trayIcon.activated.connect(mainWindow.activateWindow)
+    trayIcon.activated.connect(mainWindow.setFocusOnWindow)
 
     trayIcon.setContextMenu(menu)
     trayIcon.setVisible(True)

diff --git a/CherryTomato/main_window.py b/CherryTomato/main_window.py
@@ -119,12 +119,16 @@ def setColor(self, base: tuple, highlight: tuple):
         self.progress.setPalette(palette)
         self.button.setColor(highlight)
 
+    @Qt.pyqtSlot(name='setFocusOnWindowAndPlayNotification')
+    def setFocusOnWindow(self):
+        self.show()
+        self.activateWindow()
+        self.raise_()
+
     @Qt.pyqtSlot(name='setFocusOnWindowAndPlayNotification')
     def setFocusOnWindowAndPlayNotification(self):
         if self.settings.interrupt:
-            self.raise_()
-            self.show()
-            self.activateWindow()
+            self.setFocusOnWindow()
             if self.windowState() == QtCore.Qt.WindowMinimized:
                 # Window is minimised. Restore it.
                 self.setWindowState(QtCore.Qt.WindowNoState)