Merge pull request #4138 from canonical/project-oss-revival-t78231

Honour the close setting when quitting from the tray (clone of #4068)

Author: ricab

src/client/gui/lib/main.dart

@@ -166,7 +166,18 @@ class _AppState extends ConsumerState<App> with WindowListener {
     final daemonAvailable = ref.read(daemonAvailableProvider);
     final vmsRunning =
         ref.read(vmStatusesProvider).values.contains(Status.RUNNING);
-    if (!daemonAvailable || !vmsRunning) windowManager.destroy();
+    final closeJob = ref.read(guiSettingProvider(onAppCloseKey));
+
+    // nothing to do
+    if (!daemonAvailable || !vmsRunning || closeJob == 'nothing') {
+      windowManager.destroy();
+      return;
+    }
+
+    // checking the need to restore the window
+    if (!await windowManager.isVisible() || await windowManager.isMinimized()) {
+      windowManager.showAndRestore();
+    }
 
     stopAllInstances() {
       final notificationsNotifier = ref.read(notificationsProvider.notifier);
@@ -181,31 +192,28 @@ class _AppState extends ConsumerState<App> with WindowListener {
       );
     }
 
-    switch (ref.read(guiSettingProvider(onAppCloseKey))) {
-      case 'nothing':
-        windowManager.destroy();
-      case 'stop':
-        stopAllInstances();
-      default:
-        showDialog(
-          context: context,
-          barrierDismissible: false,
-          builder: (context) => BeforeQuitDialog(
-            onStop: (remember) {
-              ref
-                  .read(guiSettingProvider(onAppCloseKey).notifier)
-                  .set(remember ? 'stop' : 'ask');
-              stopAllInstances();
-              Navigator.pop(context);
-            },
-            onKeep: (remember) {
-              ref
-                  .read(guiSettingProvider(onAppCloseKey).notifier)
-                  .set(remember ? 'nothing' : 'ask');
-              windowManager.destroy();
-            },
-          ),
-        );
+    if (closeJob == 'ask') {
+      showDialog(
+        context: context,
+        barrierDismissible: false,
+        builder: (context) => BeforeQuitDialog(
+          onStop: (remember) {
+            ref
+                .read(guiSettingProvider(onAppCloseKey).notifier)
+                .set(remember ? 'stop' : 'ask');
+            stopAllInstances();
+            Navigator.pop(context);
+          },
+          onKeep: (remember) {
+            ref
+                .read(guiSettingProvider(onAppCloseKey).notifier)
+                .set(remember ? 'nothing' : 'ask');
+            windowManager.destroy();
+          },
+        ),
+      );
+    } else {
+      stopAllInstances();
     }
   }
 }

src/client/gui/lib/tray_menu.dart

@@ -95,7 +95,7 @@ Future<void> setupTrayMenu(ProviderContainer providerContainer) async {
   await TrayMenu.instance.addLabel(
     'quit',
     label: 'Quit',
-    callback: (_, __) => windowManager.destroy(),
+    callback: (_, __) => windowManager.close(),
   );
 
   await TrayMenu.instance.show(await _iconFilePath());