Skip to content

Commit e2078d3

Browse files
committed
PR feedback
1 parent d1d56fe commit e2078d3

File tree

3 files changed

+18
-19
lines changed

3 files changed

+18
-19
lines changed

examples/multi_window_ref_app/lib/app/main_window.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class _ActiveWindowsTable extends StatelessWidget {
137137
return Theme.of(context)
138138
.colorScheme
139139
.primary
140-
.withOpacity(0.08);
140+
.withAlpha(20);
141141
}
142142
return Colors.transparent;
143143
}),
@@ -185,7 +185,7 @@ class _ActiveWindowsTable extends StatelessWidget {
185185
}
186186

187187
class _WindowCreatorCard extends StatelessWidget {
188-
_WindowCreatorCard(
188+
const _WindowCreatorCard(
189189
{required this.selectedWindow,
190190
required this.windowManagerModel,
191191
required this.windowSettings});

examples/multi_window_ref_app/lib/app/window_controller_render.dart

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,19 @@ import 'window_manager_model.dart';
44
import 'window_settings.dart';
55

66
class WindowControllerRender extends StatelessWidget {
7-
WindowControllerRender(
7+
const WindowControllerRender(
88
{required this.controller,
99
required this.onDestroyed,
1010
required this.onError,
1111
required this.windowSettings,
1212
required this.windowManagerModel,
13-
required this.key});
13+
required super.key});
1414

1515
final WindowController controller;
1616
final VoidCallback onDestroyed;
1717
final VoidCallback onError;
1818
final WindowSettings windowSettings;
1919
final WindowManagerModel windowManagerModel;
20-
final Key key;
2120

2221
@override
2322
Widget build(BuildContext context) {

packages/flutter/lib/src/widgets/window.dart

+14-14
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,8 @@ class RegularWindow extends StatefulWidget {
8080
this.onDestroyed,
8181
this.onError,
8282
super.key,
83-
required Size preferredSize,
84-
required this.child})
85-
: _preferredSize = preferredSize;
83+
required this.preferredSize,
84+
required this.child});
8685

8786
/// Controller for this widget.
8887
final RegularWindowController? controller;
@@ -93,7 +92,8 @@ class RegularWindow extends StatefulWidget {
9392
/// Called when an error is encountered during the creation of this widget.
9493
final void Function(String?)? onError;
9594

96-
final Size _preferredSize;
95+
/// Preferred size of the window.
96+
final Size preferredSize;
9797

9898
/// The content rendered into this window.
9999
final Widget child;
@@ -113,15 +113,15 @@ class _RegularWindowState extends State<RegularWindow> {
113113
void initState() {
114114
super.initState();
115115
final Future<WindowCreationResult> createRegularFuture =
116-
createRegular(size: widget._preferredSize);
116+
createRegular(size: widget.preferredSize);
117117
setState(() {
118118
_future = createRegularFuture;
119119
});
120120

121121
createRegularFuture.then((WindowCreationResult metadata) async {
122-
_viewId = metadata.flView.viewId;
122+
_viewId = metadata.view.viewId;
123123
if (widget.controller != null) {
124-
widget.controller!.view = metadata.flView;
124+
widget.controller!.view = metadata.view;
125125
widget.controller!.parentViewId = metadata.parent;
126126
widget.controller!.size = metadata.size;
127127
}
@@ -131,7 +131,7 @@ class _RegularWindowState extends State<RegularWindow> {
131131
_WindowingAppContext.of(context);
132132
assert(windowingAppContext != null);
133133
_listener = _WindowListener(
134-
viewId: metadata.flView.viewId,
134+
viewId: metadata.view.viewId,
135135
onChanged: (_WindowChangeProperties properties) {
136136
if (widget.controller == null) {
137137
return;
@@ -165,7 +165,7 @@ class _RegularWindowState extends State<RegularWindow> {
165165
}
166166

167167
// In the event that we're being disposed before we've been destroyed
168-
// we need to destroy ther window on our way out.
168+
// we need to destroy the window on our way out.
169169
if (!_hasBeenDestroyed && _viewId != null) {
170170
// In the event of an argument error, we do nothing. We assume that
171171
// the window has been successfully destroyed somehow else.
@@ -189,9 +189,9 @@ class _RegularWindowState extends State<RegularWindow> {
189189
}
190190

191191
return View(
192-
view: metadata.data!.flView,
192+
view: metadata.data!.view,
193193
child: WindowContext(
194-
viewId: metadata.data!.flView.viewId, child: widget.child));
194+
viewId: metadata.data!.view.viewId, child: widget.child));
195195
});
196196
}
197197
}
@@ -219,13 +219,13 @@ class WindowContext extends InheritedWidget {
219219
class WindowCreationResult {
220220
/// Creates a new window.
221221
WindowCreationResult(
222-
{required this.flView,
222+
{required this.view,
223223
required this.archetype,
224224
required this.size,
225225
this.parent});
226226

227227
/// The view associated with the window.
228-
final FlutterView flView;
228+
final FlutterView view;
229229

230230
/// The archetype of the window.
231231
final WindowArchetype archetype;
@@ -271,7 +271,7 @@ Future<WindowCreationResult> _createWindow(
271271
);
272272

273273
return WindowCreationResult(
274-
flView: flView,
274+
view: flView,
275275
archetype: archetype,
276276
size: Size((size[0]! as int).toDouble(), (size[1]! as int).toDouble()),
277277
parent: parentViewId);

0 commit comments

Comments
 (0)