Merge branch 'kgdev' into 'master'

Run Gallery in editor as well.

See merge request upm-packages/ui-widgets/com.unity.uiwidgets!168

Runtime/editor/editor_window.cs

             this.wantsMouseEnterLeaveWindow = true;
         }
 
-        void OnEnable() {
+        protected virtual void Awake() {
+        }
+
+        protected virtual void OnEnable() {
             if (this._windowAdapter == null) {
                 this._windowAdapter = new EditorWindowAdapter(this);
             }
-            var rootRenderBox = this.rootRenderBox();
+            RenderBox rootRenderBox;
+            using (this._windowAdapter.getScope()) {
+                rootRenderBox = this.createRenderBox();
+            }
+
-            this._windowAdapter.attachRootWidget(this.rootWidget());
+            Widget rootWidget;
+            using (this._windowAdapter.getScope()) {
+                rootWidget = this.createWidget();
+            }
+
+            this._windowAdapter.attachRootWidget(rootWidget);
-        void OnDisable() {
+        protected virtual void OnDisable() {
-        void OnGUI() {
+        protected virtual void OnGUI() {
-        void Update() {
+        protected virtual void Update() {
-        protected virtual RenderBox rootRenderBox() {
+        protected virtual RenderBox createRenderBox() {
-        protected abstract Widget rootWidget();
+        protected abstract Widget createWidget();
     }
 
     public class EditorWindowAdapter : WindowAdapter {

Samples/UIWidgetsGallery/GalleryMainEditor.cs

+using UIWidgetsGallery.gallery;
+using Unity.UIWidgets.editor;
+using Unity.UIWidgets.ui;
+using Unity.UIWidgets.widgets;
+using UnityEditor;
+using UnityEngine;
+
+namespace UIWidgetsGallery {
+    public class GalleryMainEditor : UIWidgetsEditorWindow {
+        
+        [MenuItem("UIWidgetsTests/Gallery")]
+        public static void gallery() {
+            EditorWindow.GetWindow<GalleryMainEditor>();
+        }
+        
+        protected override Widget createWidget() {
+            return new GalleryApp();
+        }
+        
+        protected override void Awake() {
+            base.Awake();
+            FontManager.instance.addFont(Resources.Load<Font>("MaterialIcons-Regular"), "Material Icons");
+            FontManager.instance.addFont(Resources.Load<Font>("GalleryIcons"), "GalleryIcons");
+        }
+    }
+}

Samples/UIWidgetsGallery/GalleryMainEditor.cs.meta

+fileFormatVersion: 2
+guid: 1a499c991275944c983bdc42598f80b0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: