Refactor regular windows (#20)

* refactor: the RegularWindowController now holds all initial values and is solely responsible for creating and destroying a window

* Updated multi window reference app and window tests

Author: mattkae

examples/multi_window_ref_app/lib/app/main_window.dart

@@ -7,8 +7,8 @@ import 'window_manager_model.dart';
 
 class MainWindow extends StatefulWidget {
   MainWindow({super.key, required WindowController mainController}) {
-    _windowManagerModel.add(
-        KeyedWindowController(isMainWindow: true, controller: mainController));
+    _windowManagerModel.add(KeyedWindowController(
+        isMainWindow: true, key: UniqueKey(), controller: mainController));
   }
 
   final WindowManagerModel _windowManagerModel = WindowManagerModel();
@@ -70,9 +70,9 @@ class _MainWindowState extends State<MainWindow> {
                     windowSettings: widget._settings,
                     windowManagerModel: widget._windowManagerModel,
                     onDestroyed: () =>
-                        widget._windowManagerModel.remove(controller),
+                        widget._windowManagerModel.remove(controller.key),
                     onError: () =>
-                        widget._windowManagerModel.remove(controller),
+                        widget._windowManagerModel.remove(controller.key),
                   ));
                 }
               }
@@ -134,10 +134,7 @@ class _ActiveWindowsTable extends StatelessWidget {
                 key: controller.key,
                 color: WidgetStateColor.resolveWith((states) {
                   if (states.contains(WidgetState.selected)) {
-                    return Theme.of(context)
-                        .colorScheme
-                        .primary
-                        .withAlpha(20);
+                    return Theme.of(context).colorScheme.primary.withAlpha(20);
                   }
                   return Colors.transparent;
                 }),
@@ -153,8 +150,8 @@ class _ActiveWindowsTable extends StatelessWidget {
                     ListenableBuilder(
                         listenable: controller.controller,
                         builder: (BuildContext context, Widget? _) => Text(
-                            controller.controller.view != null
-                                ? '${controller.controller.view?.viewId}'
+                            controller.controller.isReady
+                                ? '${controller.controller.view.viewId}'
                                 : 'Loading...')),
                   ),
                   DataCell(
@@ -218,8 +215,15 @@ class _WindowCreatorCard extends StatelessWidget {
               children: [
                 OutlinedButton(
                   onPressed: () async {
+                    final UniqueKey key = UniqueKey();
                     windowManagerModel.add(KeyedWindowController(
-                        controller: RegularWindowController()));
+                        key: key,
+                        controller: RegularWindowController(
+                            onDestroyed: () => windowManagerModel.remove(key),
+                            onError: (String error) =>
+                                windowManagerModel.remove(key),
+                            title: "Regular",
+                            size: windowSettings.regularSize)));
                   },
                   child: const Text('Regular'),
                 ),

examples/multi_window_ref_app/lib/app/regular_window_content.dart

@@ -84,8 +84,16 @@ class _RegularWindowContentState extends State<RegularWindowContent>
             children: [
               ElevatedButton(
                 onPressed: () {
+                  final UniqueKey key = UniqueKey();
                   widget.windowManagerModel.add(KeyedWindowController(
-                      controller: RegularWindowController()));
+                      key: key,
+                      controller: RegularWindowController(
+                          onDestroyed: () =>
+                              widget.windowManagerModel.remove(key),
+                          onError: (String error) =>
+                              widget.windowManagerModel.remove(key),
+                          title: "Regular",
+                          size: widget.windowSettings.regularSize)));
                 },
                 child: const Text('Create Regular Window'),
               ),
@@ -121,8 +129,9 @@ class _RegularWindowContentState extends State<RegularWindowContent>
                     windowSettings: widget.windowSettings,
                     windowManagerModel: widget.windowManagerModel,
                     onDestroyed: () =>
-                        widget.windowManagerModel.remove(controller),
-                    onError: () => widget.windowManagerModel.remove(controller),
+                        widget.windowManagerModel.remove(controller.key),
+                    onError: () =>
+                        widget.windowManagerModel.remove(controller.key),
                   ));
                 }
               }

examples/multi_window_ref_app/lib/app/window_controller_render.dart

@@ -24,10 +24,6 @@ class WindowControllerRender extends StatelessWidget {
       case WindowArchetype.regular:
         return RegularWindow(
             key: key,
-            onDestroyed: onDestroyed,
-            onError: (String? reason) => onError(),
-            size: windowSettings.regularSize,
-            title: "Regular",
             controller: controller as RegularWindowController,
             child: RegularWindowContent(
                 window: controller as RegularWindowController,

examples/multi_window_ref_app/lib/app/window_manager_model.dart

@@ -2,12 +2,15 @@ import 'package:flutter/widgets.dart';
 
 class KeyedWindowController {
   KeyedWindowController(
-      {this.parent, this.isMainWindow = false, required this.controller});
+      {this.parent,
+      this.isMainWindow = false,
+      required this.key,
+      required this.controller});
 
   final WindowController? parent;
-  final WindowController controller;
   final bool isMainWindow;
-  final UniqueKey key = UniqueKey();
+  final UniqueKey key;
+  final WindowController controller;
 }
 
 /// Manages a flat list of all of the [WindowController]s that have been
@@ -23,7 +26,7 @@ class WindowManagerModel extends ChangeNotifier {
     }
 
     for (final KeyedWindowController controller in _windows) {
-      if (controller.controller.view?.viewId == _selectedViewId) {
+      if (controller.controller.view.viewId == _selectedViewId) {
         return controller.controller;
       }
     }
@@ -36,8 +39,8 @@ class WindowManagerModel extends ChangeNotifier {
     notifyListeners();
   }
 
-  void remove(KeyedWindowController window) {
-    _windows.remove(window);
+  void remove(UniqueKey key) {
+    _windows.removeWhere((KeyedWindowController window) => window.key == key);
     notifyListeners();
   }
 

examples/multi_window_ref_app/lib/main.dart

@@ -2,13 +2,14 @@ import 'package:flutter/material.dart';
 import 'app/main_window.dart';
 
 void main() {
-  final RegularWindowController controller = RegularWindowController();
+  final RegularWindowController controller = RegularWindowController(
+    size: const Size(800, 600),
+    sizeConstraints: const BoxConstraints(minWidth: 640, minHeight: 480),
+    title: "Multi-Window Reference Application",
+  );
   runWidget(WindowingApp(children: <Widget>[
     RegularWindow(
         controller: controller,
-        size: const Size(800, 600),
-        sizeConstraints: const BoxConstraints(minWidth: 640, minHeight: 480),
-        title: "Multi-Window Reference Application",
         child: MaterialApp(home: MainWindow(mainController: controller)))
   ]));
 }