Skip to content

refactor of the foundational code per the updated spec #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattkae merged 26 commits into from
Dec 10, 2024
Merged

refactor of the foundational code per the updated spec #11

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
21bb45a
wip: refactor of the foundational code
mattkae Nov 25, 2024
05b1052
wip: refactored the mutlti window reference app to use new API
mattkae Nov 25, 2024
1205927
wip: able to create windows in the reference application again
mattkae Nov 25, 2024
1866aba
Selection and rerenders are functioning appropriately
mattkae Dec 4, 2024
ab185bb
Able to remove an application, albeit with some bugs + refactored how…
mattkae Dec 4, 2024
018edc3
Able to add and remove windows
mattkae Dec 4, 2024
e085b32
All windows are now showing in the list
mattkae Dec 5, 2024
68d219b
Added the ability to listen for errors and respond to them accordingly
mattkae Dec 5, 2024
06b3cdc
The future should be set in setState
mattkae Dec 5, 2024
7910164
Properly handling the event where we need to destroy the widget durin…
mattkae Dec 5, 2024
56676f6
Fix issue where setState returned a future
mattkae Dec 5, 2024
a9bf478
setState is ssynchronous, whoops!
mattkae Dec 5, 2024
1a6aed7
Refactored window.dart to be more concise for the initial PR
mattkae Dec 5, 2024
47d5911
Fixed issue where we might accidentally dispose of a window twice
mattkae Dec 5, 2024
d3c2fb6
Making the WindowMetadata public and only refresing the relevant fiel…
mattkae Dec 5, 2024
d6322fe
RegularWindowMetadata and WindowMetadata are useless
mattkae Dec 5, 2024
7121af2
It does not make sense for the modify method to be an override since …
mattkae Dec 6, 2024
d84944d
Merge branch 'foundation-refactor' of github.com:canonical/flutter in…
mattkae Dec 6, 2024
986800e
bugfix: able to select the initial wndow in the table
mattkae Dec 9, 2024
cb32700
Reimplement the rotating cube in the demo app
mattkae Dec 9, 2024
e4ba963
PR feedback
mattkae Dec 9, 2024
589621b
Rendering correct text
mattkae Dec 9, 2024
0c5ccf4
Merge branch 'foundation' into foundation-refactor
mattkae Dec 9, 2024
539333b
Reverting back to the old runner code
mattkae Dec 9, 2024
438e00e
Merge branch 'foundation' into foundation-refactor
mattkae Dec 9, 2024
aba015d
Update runner code to work with the latest & greatest
mattkae Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
299 changes: 143 additions & 156 deletions examples/multi_window_ref_app/lib/app/main_window.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,27 @@
import 'package:flutter/material.dart';
import 'package:multi_window_ref_app/app/window_controller_render.dart';

import 'regular_window.dart';
import 'window_settings.dart';
import 'window_settings_dialog.dart';
import 'window_manager_model.dart';

class MainWindow extends StatefulWidget {
const MainWindow({super.key});
MainWindow({super.key, required WindowController mainController}) {
_windowManagerModel.add(
KeyedWindowController(isMainWindow: true, controller: mainController));
}

final WindowManagerModel _windowManagerModel = WindowManagerModel();
final WindowSettings _settings = WindowSettings();

@override
State<MainWindow> createState() => _MainWindowState();
}

class _MainWindowState extends State<MainWindow> {
int selectedRowIndex = -1;
final List<Window> _managedWindows = <Window>[];

@override
Widget build(BuildContext context) {
List<Window> getWindowsInTree(List<Window> windows) {
return windows
.expand((window) => [window, ...getWindowsInTree(window.children)])
.toList();
}

final List<Window> windows =
getWindowsInTree(MultiWindowAppContext.of(context)!.windows);

final widget = Scaffold(
final child = Scaffold(
appBar: AppBar(
title: const Text('Multi Window Reference App'),
),
Expand All @@ -38,162 +33,166 @@ class _MainWindowState extends State<MainWindow> {
child: SingleChildScrollView(
scrollDirection: Axis.vertical,
child: _ActiveWindowsTable(
windows: windows,
selectedRowIndex: selectedRowIndex,
onSelectedRowIndexChanged: (int index) =>
setState(() => selectedRowIndex = index),
),
windowManagerModel: widget._windowManagerModel),
),
),
Expanded(
flex: 40,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_WindowCreatorCard(
selectedWindow: selectedRowIndex < 0 ||
selectedRowIndex >= windows.length
? null
: windows[selectedRowIndex],
onDialogOpened: (window) => _managedWindows.add(window),
onDialogClosed: (window) => _managedWindows.remove(window)),
ListenableBuilder(
listenable: widget._windowManagerModel,
builder: (BuildContext context, Widget? child) {
return _WindowCreatorCard(
selectedWindow: widget._windowManagerModel.selected,
windowManagerModel: widget._windowManagerModel,
windowSettings: widget._settings);
})
],
),
),
],
),
);

final window = WindowContext.of(context)!.window;
final List<Widget> childViews = <Widget>[];
for (final Window childWindow in window.children) {
if (!_shouldRenderWindow(childWindow)) {
continue;
}

childViews.add(View(
view: childWindow.view,
child: WindowContext(
window: childWindow,
child: childWindow.builder(context),
),
));
}

return ViewAnchor(view: ViewCollection(views: childViews), child: widget);
}

bool _shouldRenderWindow(Window window) {
return !_managedWindows.contains(window);
return ViewAnchor(
view: ListenableBuilder(
listenable: widget._windowManagerModel,
builder: (BuildContext context, Widget? _) {
final List<Widget> childViews = <Widget>[];
for (final KeyedWindowController controller
in widget._windowManagerModel.windows) {
if (controller.parent == null && !controller.isMainWindow) {
childViews.add(WindowControllerRender(
controller: controller.controller,
key: controller.key,
windowSettings: widget._settings,
windowManagerModel: widget._windowManagerModel,
onDestroyed: () =>
widget._windowManagerModel.remove(controller),
onError: () =>
widget._windowManagerModel.remove(controller),
));
}
}

return ViewCollection(views: childViews);
}),
child: child);
}
}

class _ActiveWindowsTable extends StatelessWidget {
const _ActiveWindowsTable(
{required this.windows,
required this.selectedRowIndex,
required this.onSelectedRowIndexChanged});
const _ActiveWindowsTable({required this.windowManagerModel});

final List<Window> windows;
final int selectedRowIndex;
final void Function(int) onSelectedRowIndexChanged;
final WindowManagerModel windowManagerModel;

@override
Widget build(BuildContext context) {
return DataTable(
showBottomBorder: true,
onSelectAll: (selected) {
onSelectedRowIndexChanged(-1);
},
columns: const [
DataColumn(
label: SizedBox(
width: 20,
child: Text(
'ID',
style: TextStyle(
fontSize: 16,
return ListenableBuilder(
listenable: windowManagerModel,
builder: (BuildContext context, Widget? widget) {
return DataTable(
showBottomBorder: true,
onSelectAll: (selected) {
windowManagerModel.select(null);
},
columns: const [
DataColumn(
label: SizedBox(
width: 20,
child: Text(
'ID',
style: TextStyle(
fontSize: 16,
),
),
),
),
),
),
),
DataColumn(
label: SizedBox(
width: 120,
child: Text(
'Type',
style: TextStyle(
fontSize: 16,
DataColumn(
label: SizedBox(
width: 120,
child: Text(
'Type',
style: TextStyle(
fontSize: 16,
),
),
),
),
),
),
),
DataColumn(
label: SizedBox(
width: 20,
child: Text(''),
),
numeric: true),
],
rows: windows.asMap().entries.map<DataRow>((indexedEntry) {
final index = indexedEntry.key;
final Window entry = indexedEntry.value;
final window = entry;
final viewId = window.view.viewId;
final archetype = window.archetype;
final isSelected = selectedRowIndex == index;

return DataRow(
color: WidgetStateColor.resolveWith((states) {
if (states.contains(WidgetState.selected)) {
return Theme.of(context).colorScheme.primary.withOpacity(0.08);
}
return Colors.transparent;
}),
selected: isSelected,
onSelectChanged: (selected) {
if (selected != null) {
onSelectedRowIndexChanged(selected ? index : -1);
}
},
cells: [
DataCell(
Text('$viewId'),
),
DataCell(
Text(archetype.toString().replaceFirst('WindowArchetype.', '')),
),
DataCell(
IconButton(
icon: const Icon(Icons.delete_outlined),
onPressed: () {
destroyWindow(context, window);
DataColumn(
label: SizedBox(
width: 20,
child: Text(''),
),
numeric: true),
],
rows: (windowManagerModel.windows)
.map<DataRow>((KeyedWindowController controller) {
return DataRow(
key: controller.key,
color: WidgetStateColor.resolveWith((states) {
if (states.contains(WidgetState.selected)) {
return Theme.of(context)
.colorScheme
.primary
.withOpacity(0.08);
}
return Colors.transparent;
}),
selected: controller.controller == windowManagerModel.selected,
onSelectChanged: (selected) {
if (selected != null) {
windowManagerModel.select(
selected ? controller.controller.view?.viewId : null);
}
},
),
),
],
);
}).toList(),
);
cells: [
DataCell(
ListenableBuilder(
listenable: controller.controller,
builder: (BuildContext context, Widget? _) => Text(
controller.controller.view != null
? '${controller.controller.view?.viewId}'
: 'Loading...')),
),
DataCell(
ListenableBuilder(
listenable: controller.controller,
builder: (BuildContext context, Widget? _) => Text(
controller.controller.type
.toString()
.replaceFirst('WindowArchetype.', ''))),
),
DataCell(
ListenableBuilder(
listenable: controller.controller,
builder: (BuildContext context, Widget? _) =>
IconButton(
icon: const Icon(Icons.delete_outlined),
onPressed: () async {
await controller.controller.destroy();
},
)),
),
],
);
}).toList(),
);
});
}
}

class _WindowCreatorCard extends StatefulWidget {
const _WindowCreatorCard(
class _WindowCreatorCard extends StatelessWidget {
_WindowCreatorCard(
{required this.selectedWindow,
required this.onDialogOpened,
required this.onDialogClosed});

final Window? selectedWindow;
final void Function(Window) onDialogOpened;
final void Function(Window) onDialogClosed;

@override
State<StatefulWidget> createState() => _WindowCreatorCardState();
}
required this.windowManagerModel,
required this.windowSettings});

class _WindowCreatorCardState extends State<_WindowCreatorCard> {
WindowSettings _settings = WindowSettings();
final WindowController? selectedWindow;
final WindowManagerModel windowManagerModel;
final WindowSettings windowSettings;

@override
Widget build(BuildContext context) {
Expand All @@ -219,12 +218,8 @@ class _WindowCreatorCardState extends State<_WindowCreatorCard> {
children: [
OutlinedButton(
onPressed: () async {
await createRegular(
context: context,
size: _settings.regularSize,
builder: (BuildContext context) {
return const MaterialApp(home: RegularWindowContent());
});
windowManagerModel.add(KeyedWindowController(
controller: RegularWindowController()));
},
child: const Text('Regular'),
),
Expand All @@ -234,15 +229,7 @@ class _WindowCreatorCardState extends State<_WindowCreatorCard> {
child: TextButton(
child: const Text('SETTINGS'),
onPressed: () {
windowSettingsDialog(context, _settings,
widget.onDialogOpened, widget.onDialogClosed)
.then(
(WindowSettings? settings) {
if (settings != null) {
_settings = settings;
}
},
);
windowSettingsDialog(context, windowSettings);
},
),
),
Expand Down
Loading