Able to remove an application, albeit with some bugs + refactored how settings are donw

Author: mattkae

examples/multi_window_ref_app/lib/app/main_window.dart

@@ -1,5 +1,7 @@
+import 'dart:ui';
+
 import 'package:flutter/material.dart';
-import 'package:multi_window_ref_app/app/window_metadata_content.dart';
+import 'package:multi_window_ref_app/app/window_controller_render.dart';
 
 import 'window_settings.dart';
 import 'window_settings_dialog.dart';
@@ -47,6 +49,7 @@ class MainWindow extends StatefulWidget {
 
 class _MainWindowState extends State<MainWindow> {
   final _WindowManagerModel _windowManagerModel = _WindowManagerModel();
+  final WindowSettings _settings = WindowSettings();
 
   @override
   Widget build(BuildContext context) {
@@ -75,7 +78,8 @@ class _MainWindowState extends State<MainWindow> {
                     builder: (BuildContext context, Widget? child) {
                       return _WindowCreatorCard(
                           selectedWindow: _windowManagerModel.selected,
-                          windowManagerModel: _windowManagerModel);
+                          windowManagerModel: _windowManagerModel,
+                          windowSettings: _settings);
                     })
               ],
             ),
@@ -88,22 +92,31 @@ class _MainWindowState extends State<MainWindow> {
         view: ListenableBuilder(
             listenable: _windowManagerModel,
             builder: (BuildContext context, Widget? widget) {
-              return _ViewCollection(windowManagerModel: _windowManagerModel);
+              return _ViewCollection(
+                  windowManagerModel: _windowManagerModel,
+                  windowSettings: _settings);
             }),
         child: widget);
   }
 }
 
 class _ViewCollection extends StatelessWidget {
-  _ViewCollection({required this.windowManagerModel});
+  _ViewCollection(
+      {required this.windowManagerModel, required this.windowSettings});
 
-  _WindowManagerModel windowManagerModel;
+  final _WindowManagerModel windowManagerModel;
+  final WindowSettings windowSettings;
 
   @override
   Widget build(BuildContext context) {
     final List<Widget> childViews = <Widget>[];
-    for (final WindowController childWindow in windowManagerModel.windows) {
-      childViews.add(WindowMetadataContent(controller: childWindow));
+    for (final WindowController controller in windowManagerModel.windows) {
+      childViews.add(WindowControllerRender(
+          controller: controller,
+          onDestroyed: () {
+            windowManagerModel.remove(controller);
+          },
+          windowSettings: windowSettings));
     }
 
     return ViewCollection(views: childViews);
@@ -211,19 +224,15 @@ class _ActiveWindowsTable extends StatelessWidget {
   }
 }
 
-class _WindowCreatorCard extends StatefulWidget {
-  const _WindowCreatorCard(
-      {required this.selectedWindow, required this.windowManagerModel});
+class _WindowCreatorCard extends StatelessWidget {
+  _WindowCreatorCard(
+      {required this.selectedWindow,
+      required this.windowManagerModel,
+      required this.windowSettings});
 
   final WindowController? selectedWindow;
   final _WindowManagerModel windowManagerModel;
-
-  @override
-  State<StatefulWidget> createState() => _WindowCreatorCardState();
-}
-
-class _WindowCreatorCardState extends State<_WindowCreatorCard> {
-  WindowSettings _settings = WindowSettings();
+  final WindowSettings windowSettings;
 
   @override
   Widget build(BuildContext context) {
@@ -249,7 +258,7 @@ class _WindowCreatorCardState extends State<_WindowCreatorCard> {
               children: [
                 OutlinedButton(
                   onPressed: () async {
-                    widget.windowManagerModel.add(RegularWindowController());
+                    windowManagerModel.add(RegularWindowController());
                   },
                   child: const Text('Regular'),
                 ),
@@ -259,13 +268,7 @@ class _WindowCreatorCardState extends State<_WindowCreatorCard> {
                   child: TextButton(
                     child: const Text('SETTINGS'),
                     onPressed: () {
-                      windowSettingsDialog(context, _settings).then(
-                        (WindowSettings? settings) {
-                          if (settings != null) {
-                            _settings = settings;
-                          }
-                        },
-                      );
+                      windowSettingsDialog(context, windowSettings);
                     },
                   ),
                 ),

examples/multi_window_ref_app/lib/app/regular_window_content.dart

@@ -1,17 +1,19 @@
 import 'package:flutter/material.dart';
-import 'package:multi_window_ref_app/app/window_metadata_content.dart';
+import 'package:multi_window_ref_app/app/window_controller_render.dart';
+import 'package:multi_window_ref_app/app/window_settings.dart';
 
 class RegularWindowContent extends StatefulWidget {
-  const RegularWindowContent({super.key, required this.window});
+  const RegularWindowContent({super.key, required this.window, required this.windowSettings});
 
   final RegularWindowController window;
+  final WindowSettings windowSettings;
 
   @override
   State<RegularWindowContent> createState() => _RegularWindowContentState();
 }
 
 class _RegularWindowContentState extends State<RegularWindowContent> {
-  List<WindowController> children = <WindowController>[];
+  List<WindowController> childControllers = <WindowController>[];
 
   @override
   Widget build(BuildContext context) {
@@ -25,7 +27,10 @@ class _RegularWindowContentState extends State<RegularWindowContent> {
             ElevatedButton(
               onPressed: () {
                 setState(() {
-                  children = [...children, RegularWindowController()];
+                  childControllers = [
+                    ...childControllers,
+                    RegularWindowController()
+                  ];
                 });
               },
               child: const Text('Create Regular Window'),
@@ -48,8 +53,13 @@ class _RegularWindowContentState extends State<RegularWindowContent> {
     );
 
     final List<Widget> childViews =
-        children.map((WindowController childWindow) {
-      return WindowMetadataContent(controller: childWindow);
+        childControllers.map((WindowController controller) {
+      return WindowControllerRender(
+          controller: controller,
+          windowSettings: widget.windowSettings,
+          onDestroyed: () {
+            childControllers.remove(controller);
+          });
     }).toList();
 
     return ViewAnchor(view: ViewCollection(views: childViews), child: child);

examples/multi_window_ref_app/lib/app/window_controller_render.dart

@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+import 'package:multi_window_ref_app/app/regular_window_content.dart';
+import 'package:multi_window_ref_app/app/window_settings.dart';
+
+class WindowControllerRender extends StatelessWidget {
+  WindowControllerRender(
+      {required this.controller,
+      required this.onDestroyed,
+      required this.windowSettings});
+
+  final WindowController controller;
+  final VoidCallback onDestroyed;
+  final WindowSettings windowSettings;
+
+  @override
+  Widget build(BuildContext context) {
+    switch (controller.type) {
+      case WindowArchetype.regular:
+        return RegularWindow(
+            onDestroyed: onDestroyed,
+            preferredSize: windowSettings.regularSize,
+            controller: controller as RegularWindowController,
+            child: RegularWindowContent(
+                window: controller as RegularWindowController,
+                windowSettings: windowSettings));
+      default:
+        throw UnimplementedError(
+            "The provided window type does not have an implementation");
+    }
+  }
+}

examples/multi_window_ref_app/lib/app/window_metadata_content.dart

@@ -1,21 +1,13 @@
 import 'package:flutter/material.dart';
 
-class WindowSettings {
-  WindowSettings(
-      {this.regularSize = const Size(400, 300),
-      this.floatingRegularSize = const Size(300, 300),
-      this.dialogSize = const Size(300, 250),
-      this.satelliteSize = const Size(150, 300),
-      this.popupSize = const Size(200, 200),
-      this.tipSize = const Size(140, 140),
-      this.anchorToWindow = false,
-      this.anchorRect = const Rect.fromLTWH(0, 0, 1000, 1000)});
-  final Size regularSize;
-  final Size floatingRegularSize;
-  final Size dialogSize;
-  final Size satelliteSize;
-  final Size popupSize;
-  final Size tipSize;
-  final Rect anchorRect;
-  final bool anchorToWindow;
+class WindowSettings extends ChangeNotifier {
+  WindowSettings({Size regularSize = const Size(400, 300)})
+      : _regularSize = regularSize;
+
+  Size _regularSize;
+  Size get regularSize => _regularSize;
+  set regularSize(Size value) {
+    _regularSize = value;
+    notifyListeners();
+  }
 }