From b3528bd7175e23bb0525eafa551cb7aa0180b5f2 Mon Sep 17 00:00:00 2001
From: Andrei Smirnov <andrei.smirnov@toptal.com>
Date: Mon, 19 Jul 2021 15:14:10 +0300
Subject: [PATCH] =?UTF-8?q?=EF=BB=BFfix(@desktop):=20missing=20context=20m?=
 =?UTF-8?q?enu=20on=20SystemTrayIcon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/nim_status_client.nim |  2 +-
 ui/main.qml               | 17 ++++++++++-------
 vendor/DOtherSide         |  2 +-
 vendor/nimqml             |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/nim_status_client.nim b/src/nim_status_client.nim
index 7a675fc83d..a7f0dacba0 100644
--- a/src/nim_status_client.nim
+++ b/src/nim_status_client.nim
@@ -47,7 +47,7 @@ proc mainProc() =
   enableHDPI()
   initializeOpenGL()
 
-  let app = newQApplication("Status Desktop")
+  let app = newQGuiApplication()
   let resources =
     if defined(windows) and defined(production):
       "/../resources/resources.rcc"
diff --git a/ui/main.qml b/ui/main.qml
index b6a5b546d0..b2108c7018 100644
--- a/ui/main.qml
+++ b/ui/main.qml
@@ -143,14 +143,20 @@ StatusWindow {
                     return "shared/img/status-logo-dev-circle.svg"
             }
         }
+
+        function openStatusWindow() {
+            applicationWindow.show()
+            applicationWindow.raise()
+            applicationWindow.requestActivate()
+        }
+
         menu: Menu {
             MenuItem {
                 visible: !applicationWindow.visible
                 //% "Open Status"
                 text: qsTrId("open-status")
                 onTriggered: {
-                    applicationWindow.visible = true;
-                    applicationWindow.requestActivate();
+                    systemTray.openStatusWindow()
                 }
             }
             
@@ -166,12 +172,9 @@ StatusWindow {
         }
 
         onActivated: {
-            if (reason === SystemTrayIcon.Context) {
-                return
+            if (reason !== SystemTrayIcon.Context) {
+                openStatusWindow()
             }
-            applicationWindow.show()
-            applicationWindow.raise()
-            applicationWindow.requestActivate()
         }
     }
 
diff --git a/vendor/DOtherSide b/vendor/DOtherSide
index eaa394d711..719af38d64 160000
--- a/vendor/DOtherSide
+++ b/vendor/DOtherSide
@@ -1 +1 @@
-Subproject commit eaa394d711f757b859030349aeaf41a10e1bad2b
+Subproject commit 719af38d64d2f61a4e3c858c77a747586fdd58af
diff --git a/vendor/nimqml b/vendor/nimqml
index 65fa68c244..6a5f0ef32e 160000
--- a/vendor/nimqml
+++ b/vendor/nimqml
@@ -1 +1 @@
-Subproject commit 65fa68c244fa52037de652520755430ec65c77df
+Subproject commit 6a5f0ef32ef63b11258866f6208ccfbd43245fd3