Show closing confirmation when window isn't closed from button

Gold872 · Sep 30, 2023 · 0f8fc3d · 0f8fc3d
1 parent 0700d7b
commit 0f8fc3d
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 22 deletions.
diff --git a/lib/pages/dashboard_page.dart b/lib/pages/dashboard_page.dart
@@ -41,7 +41,7 @@ class DashboardPage extends StatefulWidget {
   State<DashboardPage> createState() => _DashboardPageState();
 }
 
-class _DashboardPageState extends State<DashboardPage> {
+class _DashboardPageState extends State<DashboardPage> with WindowListener {
   late final SharedPreferences _preferences;
   late final UpdateChecker updateChecker;
 
@@ -60,6 +60,9 @@ class _DashboardPageState extends State<DashboardPage> {
     _preferences = widget.preferences;
     updateChecker = UpdateChecker(currentVersion: widget.version);
 
+    windowManager.addListener(this);
+    Future(() async => await windowManager.setPreventClose(true));
+
     loadLayout();
 
     if (tabData.isEmpty) {
@@ -154,6 +157,29 @@ class _DashboardPageState extends State<DashboardPage> {
     Future(() => checkForUpdates(notifyIfLatest: false));
   }
 
+  @override
+  void onWindowClose() async {
+    Map<String, dynamic> savedJson =
+        jsonDecode(_preferences.getString(PrefKeys.layout) ?? '{}');
+    Map<String, dynamic> currentJson = toJson();
+
+    bool showConfirmation =
+        !const DeepCollectionEquality().equals(savedJson, currentJson);
+
+    if (showConfirmation) {
+      showCloseConfirmation(context);
+      await windowManager.focus();
+    } else {
+      await windowManager.destroy();
+    }
+  }
+
+  @override
+  void dispose() async {
+    windowManager.removeListener(this);
+    super.dispose();
+  }
+
   Map<String, dynamic> toJson() {
     List<Map<String, dynamic>> gridData = [];
 
@@ -558,14 +584,14 @@ class _DashboardPageState extends State<DashboardPage> {
 
               Future.delayed(
                 const Duration(milliseconds: 250),
-                () async => await windowManager.close(),
+                () async => await windowManager.destroy(),
               );
             },
             child: const Text('Save'),
           ),
           TextButton(
             onPressed: () async {
-              await windowManager.close();
+              await windowManager.destroy();
             },
             child: const Text('Discard'),
           ),
@@ -720,20 +746,7 @@ class _DashboardPageState extends State<DashboardPage> {
 
     return Scaffold(
       appBar: CustomAppBar(
-        onWindowClose: () async {
-          Map<String, dynamic> savedJson =
-              jsonDecode(_preferences.getString(PrefKeys.layout) ?? '{}');
-          Map<String, dynamic> currentJson = toJson();
-
-          bool showConfirmation =
-              !const DeepCollectionEquality().equals(savedJson, currentJson);
-
-          if (showConfirmation) {
-            showCloseConfirmation(context);
-          } else {
-            await windowManager.close();
-          }
-        },
+        onWindowClose: onWindowClose,
         menuBar: menuBar,
       ),
       body: CallbackShortcuts(

diff --git a/test/pages/dashboard_page_test.dart b/test/pages/dashboard_page_test.dart
@@ -485,7 +485,10 @@ void main() {
 
     expect(minimizeButton, findsOneWidget);
 
-    await widgetTester.tap(minimizeButton);
+    final minimizeButtonWidget =
+        minimizeButton.evaluate().first.widget as DecoratedMinimizeButton;
+
+    minimizeButtonWidget.onPressed?.call();
   });
 
   testWidgets('Maximizing/unmaximizing window', (widgetTester) async {
@@ -516,9 +519,10 @@ void main() {
 
     final maximizeButton = find.byType(DecoratedMaximizeButton);
 
-    expect(maximizeButton, findsOneWidget);
+    final maximizeButtonWidget =
+        maximizeButton.evaluate().first.widget as DecoratedMaximizeButton;
 
-    await widgetTester.tap(maximizeButton);
+    maximizeButtonWidget.onPressed?.call();
   });
 
   testWidgets('Closing window (All changes saved)', (widgetTester) async {
@@ -553,7 +557,10 @@ void main() {
 
     expect(closeButton, findsOneWidget);
 
-    await widgetTester.tap(closeButton);
+    final closeButtonWidget =
+        closeButton.evaluate().first.widget as DecoratedCloseButton;
+
+    closeButtonWidget.onPressed?.call();
     await widgetTester.pumpAndSettle();
 
     expect(find.widgetWithText(AlertDialog, 'Unsaved Changes'), findsNothing);
@@ -588,7 +595,10 @@ void main() {
 
     expect(closeButton, findsOneWidget);
 
-    await widgetTester.tap(closeButton);
+    final closeButtonWidget =
+        closeButton.evaluate().first.widget as DecoratedCloseButton;
+
+    closeButtonWidget.onPressed?.call();
     await widgetTester.pumpAndSettle();
 
     expect(find.widgetWithText(AlertDialog, 'Unsaved Changes'), findsOneWidget);