remove window parameter

fzhangtj · fzhangtj · commit 6594e9c75af2 · 2019-03-05T10:56:49.000+08:00
diff --git a/Runtime/editor/editor_window.cs b/Runtime/editor/editor_window.cs
@@ -419,6 +419,12 @@ public void attachRootWidget(Widget root) {
                 this._binding.attachRootWidget(root);
             }
         }
+        
+        public void attachRootWidget(Func<Widget> root) {
+            using (this.getScope()) {
+                this._binding.attachRootWidget(root());
+            }
+        }
 
         public override TextInput textInput {
             get { return this._textInput; }
diff --git a/Runtime/engine/UIWidgetsPanel.cs b/Runtime/engine/UIWidgetsPanel.cs
@@ -108,7 +108,12 @@ protected override void OnEnable() {
             this._windowAdapter = new UIWidgetWindowAdapter(this);
 
             this._windowAdapter.OnEnable();
-            this._windowAdapter.attachRootWidget(this.createWidget(this._windowAdapter));
+
+            Widget root;
+            using (this._windowAdapter.getScope()) {
+                root = this.createWidget();
+            }
+            this._windowAdapter.attachRootWidget(root);   
             this._lastMouseMove = Input.mousePosition;
 
             this._enteredPointers = new HashSet<int>();
@@ -129,7 +134,7 @@ protected override void OnDisable() {
             base.OnDisable();
         }
 
-        protected virtual Widget createWidget(Window window) {
+        protected virtual Widget createWidget() {
             return null;
         }
 
diff --git a/Runtime/widgets/app.cs b/Runtime/widgets/app.cs
@@ -33,13 +33,11 @@ public WidgetsApp(
             string initialRoute = null,
             Dictionary<string, WidgetBuilder> routes = null,
             TransitionBuilder builder = null,
-            Window window = null,
             TextStyle textStyle = null,
             Widget home = null
         ) : base(key) {
-            D.assert(window != null);
             routes = routes ?? new Dictionary<string, WidgetBuilder>();
-            this.window = window;
+            this.window = Window.instance;
             this.home = home;
             this.navigatorKey = navigatorKey;
             this.onGenerateRoute = onGenerateRoute;
diff --git a/Samples/MaterialSample/DividerButton.cs b/Samples/MaterialSample/DividerButton.cs
@@ -10,11 +10,10 @@
 namespace UIWidgetsSample {
     public class DividerButton : UIWidgetsSamplePanel {
         
-        protected override Widget createWidget(Window window) {
+        protected override Widget createWidget() {
             return new WidgetsApp(
                 home: new DemoApp(),
-                pageRouteBuilder: this.pageRouteBuilder,
-                window: window);
+                pageRouteBuilder: this.pageRouteBuilder);
         }
         
         public class DemoApp : StatefulWidget {
diff --git a/Samples/ReduxSample/CounterApp/CounterAppSample.cs b/Samples/ReduxSample/CounterApp/CounterAppSample.cs
@@ -10,11 +10,10 @@
 
 namespace Unity.UIWidgets.Sample.Redux {
     public class CounterAppSample : UIWidgetsSample.UIWidgetsSamplePanel {
-        protected override Widget createWidget(Window window) {
+        protected override Widget createWidget() {
             return new WidgetsApp(
                 home: new CounterApp(),
-                pageRouteBuilder: this.pageRouteBuilder,
-                window: window);
+                pageRouteBuilder: this.pageRouteBuilder);
         }
     }
 
diff --git a/Samples/ReduxSample/ObjectFinder/ObjectFinderApp.cs b/Samples/ReduxSample/ObjectFinder/ObjectFinderApp.cs
@@ -14,14 +14,13 @@ public class ObjectFinderApp : UIWidgetsSample.UIWidgetsSamplePanel {
         public ObjectFinderApp() {
         }
 
-        protected override Widget createWidget(Window window)  {
+        protected override Widget createWidget()  {
             return new WidgetsApp(
-                home: new StoreProvider<FinderAppState>(StoreProvider.store, this.createWidget()),
-                pageRouteBuilder: this.pageRouteBuilder,
-                window: window);
+                home: new StoreProvider<FinderAppState>(StoreProvider.store, this.createRootWidget()),
+                pageRouteBuilder: this.pageRouteBuilder);
         }
 
-        Widget createWidget() {
+        Widget createRootWidget() {
             return new StoreConnector<FinderAppState, ObjectFinderAppWidgetModel>(
                 (context, viewModel) => new ObjectFinderAppWidget(
                     viewModel, this.gameObject.name
diff --git a/Samples/UIWidgetSample/AsScreenSample.cs b/Samples/UIWidgetSample/AsScreenSample.cs
@@ -10,11 +10,10 @@
 
 namespace UIWidgetsSample {
     public class AsScreenSample : UIWidgetsSamplePanel {
-        protected override Widget createWidget(Window window) {
+        protected override Widget createWidget() {
             return new WidgetsApp(
                 home: new AsScreenWidget(),
-                pageRouteBuilder: this.pageRouteBuilder,
-                window: window);
+                pageRouteBuilder: this.pageRouteBuilder);
         }
 
         public class AsScreenWidget : StatefulWidget {
diff --git a/Samples/UIWidgetSample/CustomPaintSample.cs b/Samples/UIWidgetSample/CustomPaintSample.cs
@@ -4,14 +4,13 @@
 
 namespace UIWidgetsSample {
     public class CustomPaintSample : UIWidgetsSamplePanel {
-        protected override Widget createWidget(Window window) {
+        protected override Widget createWidget() {
             return new WidgetsApp(
                 home: new Unity.UIWidgets.widgets.CustomPaint(
                     child: new Container(width: 300, height: 300, color: new Color(0XFFFFFFFF)),
                     foregroundPainter: new GridPainter(null)
                 ),
-                pageRouteBuilder: this.pageRouteBuilder,
-                window: window);
+                pageRouteBuilder: this.pageRouteBuilder);
         }
     }
 
diff --git a/Samples/UIWidgetSample/DragDropSample.cs b/Samples/UIWidgetSample/DragDropSample.cs
@@ -7,11 +7,11 @@
 
 namespace UIWidgetsSample {
     public class DragDropSample : UIWidgetsSamplePanel {
-        protected override Widget createWidget(Window window) {
+        protected override Widget createWidget() {
             return new WidgetsApp(
                 home: new DragDropApp(),
-                pageRouteBuilder: this.pageRouteBuilder,
-                window: window);
+                pageRouteBuilder: this.pageRouteBuilder
+                );
         }
 
         class DragDropApp : StatefulWidget {
diff --git a/Samples/UIWidgetSample/ExpansionPanelSample.cs b/Samples/UIWidgetSample/ExpansionPanelSample.cs
@@ -17,11 +17,10 @@ public class ExpansionPanelSample : UIWidgetsSamplePanel {
             new ExpansionPanelWidget()
         };
 
-        protected override Widget createWidget(Window window)  {
+        protected override Widget createWidget()  {
             return new WidgetsApp(
                 home: this.testCases[this.testCaseId],
-                pageRouteBuilder: this.pageRouteBuilder,
-                window: window);
+                pageRouteBuilder: this.pageRouteBuilder);
         }
     }
 
diff --git a/Samples/UIWidgetSample/MaterialSample.cs b/Samples/UIWidgetSample/MaterialSample.cs
@@ -17,11 +17,10 @@ public class MaterialSample : UIWidgetsSamplePanel {
             new MaterialInkWellWidget()
         };
 
-        protected override Widget createWidget(Window window) {
+        protected override Widget createWidget() {
             return new WidgetsApp(
                 home: this.testCases[this.testCaseId],
-                pageRouteBuilder: this.pageRouteBuilder,
-                window: window);
+                pageRouteBuilder: this.pageRouteBuilder);
         }
     }
 
diff --git a/Samples/UIWidgetSample/NavigationSample.cs b/Samples/UIWidgetSample/NavigationSample.cs
@@ -11,16 +11,15 @@
 namespace UIWidgetsSample {
     public class NavigationSample : UIWidgetsSamplePanel {
 
-        protected override Widget createWidget(Window window) {
+        protected override Widget createWidget() {
             return new WidgetsApp(
                 initialRoute: "/",
                 textStyle: new TextStyle(fontSize: 24),
                 pageRouteBuilder: this.pageRouteBuilder,
                 routes: new Dictionary<string, WidgetBuilder> {
                     {"/", (context) => new HomeScreen()},
                     {"/detail", (context) => new DetailScreen()}
-                },
-                window: window);
+                });
         }
         
         protected override PageRouteFactory pageRouteBuilder {
diff --git a/Samples/UIWidgetSample/PageViewSample.cs b/Samples/UIWidgetSample/PageViewSample.cs
@@ -5,7 +5,7 @@
 namespace UIWidgetsSample {
     public class PageViewSample : UIWidgetsSamplePanel {
             
-        protected override Widget createWidget(Window window) {
+        protected override Widget createWidget() {
             return new WidgetsApp(
                 home: new Container(
                 width: 200,
@@ -23,8 +23,7 @@ protected override Widget createWidget(Window window) {
                         )
                     }
                 )),
-                pageRouteBuilder: this.pageRouteBuilder,
-                window: window);
+                pageRouteBuilder: this.pageRouteBuilder);
         }
     }
 }
diff --git a/Samples/UIWidgetSample/ScrollbarSample.cs b/Samples/UIWidgetSample/ScrollbarSample.cs
@@ -6,7 +6,7 @@
 
 namespace UIWidgetsSample {
     public class ScrollbarSample : UIWidgetsSamplePanel {
-        protected override Widget createWidget(Window window) {
+        protected override Widget createWidget() {
             var scroll = new Container(
                 decoration: new BoxDecoration(
                     border: Border.all(color: new Color(0xFFFFFF00))
@@ -38,8 +38,7 @@ protected override Widget createWidget(Window window) {
             );
             return new WidgetsApp(
                 home: scroll,
-                pageRouteBuilder: this.pageRouteBuilder,
-                window: window);
+                pageRouteBuilder: this.pageRouteBuilder);
         }
     }
 }
diff --git a/Samples/UIWidgetSample/TextInputSample.cs b/Samples/UIWidgetSample/TextInputSample.cs
@@ -25,11 +25,10 @@ public override State createState() {
             }
         }
 
-        protected override Widget createWidget(Window window)  {
+        protected override Widget createWidget()  {
             return new WidgetsApp(
                 home: new EditableInputTypeWidget(),
-                pageRouteBuilder: this.pageRouteBuilder,
-                window: window);
+                pageRouteBuilder: this.pageRouteBuilder);
         }
         
 
diff --git a/Samples/UIWidgetSample/ToDoAppSample.cs b/Samples/UIWidgetSample/ToDoAppSample.cs
@@ -20,11 +20,10 @@ public override State createState() {
             }
         }
 
-        protected override Widget createWidget(Window window) {
+        protected override Widget createWidget() {
             return new WidgetsApp(
                 home: new ToDoListApp(),
-                pageRouteBuilder: this.pageRouteBuilder,
-                window: window);
+                pageRouteBuilder: this.pageRouteBuilder);
         }
 
         public class CustomButton : StatelessWidget {
diff --git a/Tests/Editor/EditableTextWiget.cs b/Tests/Editor/EditableTextWiget.cs
@@ -62,7 +62,7 @@ void OnEnable() {
                     cursorColor: Color.fromARGB(255, 0, 0, 0)
                 )
             );
-            this.windowAdapter.attachRootWidget(new WidgetsApp(window: this.windowAdapter, home: this.root,
+            this.windowAdapter.attachRootWidget(() => new WidgetsApp(home: this.root,
                 pageRouteBuilder: (RouteSettings settings, WidgetBuilder builder) =>
                     new PageRouteBuilder(
                         settings: settings,
diff --git a/Tests/Editor/Widgets.cs b/Tests/Editor/Widgets.cs
@@ -90,7 +90,7 @@ void OnGUI() {
         }
 
         void _attachRootWidget(Widget widget) {
-            this.windowAdapter.attachRootWidget(new WidgetsApp(window: this.windowAdapter, home: widget,
+            this.windowAdapter.attachRootWidget(() => new WidgetsApp(home: widget,
                 pageRouteBuilder: (RouteSettings settings, WidgetBuilder builder) =>
                     new PageRouteBuilder(
                         settings: settings,

Original file line number	Diff line number	Diff line change
`@@ -419,6 +419,12 @@ public void attachRootWidget(Widget root) {`
`419`	`419`	`this._binding.attachRootWidget(root);`
`420`	`420`	`}`
`421`	`421`	`}`
	`422`	`+`
	`423`	`+ public void attachRootWidget(Func<Widget> root) {`
	`424`	`+ using (this.getScope()) {`
	`425`	`+ this._binding.attachRootWidget(root());`
	`426`	`+ }`
	`427`	`+ }`
`422`	`428`
`423`	`429`	`public override TextInput textInput {`
`424`	`430`	`get { return this._textInput; }`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,10 @@`
`10`	`10`
`11`	`11`	`namespace Unity.UIWidgets.Sample.Redux {`
`12`	`12`	`public class CounterAppSample : UIWidgetsSample.UIWidgetsSamplePanel {`
`13`		`- protected override Widget createWidget(Window window) {`
	`13`	`+ protected override Widget createWidget() {`
`14`	`14`	`return new WidgetsApp(`
`15`	`15`	`home: new CounterApp(),`
`16`		`- pageRouteBuilder: this.pageRouteBuilder,`
`17`		`- window: window);`
	`16`	`+ pageRouteBuilder: this.pageRouteBuilder);`
`18`	`17`	`}`
`19`	`18`	`}`
`20`	`19`
Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,10 @@ public class ExpansionPanelSample : UIWidgetsSamplePanel {`
`17`	`17`	`new ExpansionPanelWidget()`
`18`	`18`	`};`
`19`	`19`
`20`		`- protected override Widget createWidget(Window window) {`
	`20`	`+ protected override Widget createWidget() {`
`21`	`21`	`return new WidgetsApp(`
`22`	`22`	`home: this.testCases[this.testCaseId],`
`23`		`- pageRouteBuilder: this.pageRouteBuilder,`
`24`		`- window: window);`
	`23`	`+ pageRouteBuilder: this.pageRouteBuilder);`
`25`	`24`	`}`
`26`	`25`	`}`
`27`	`26`