Merge pull request #240 from UnityTech/fix_prefab

Fix issue introduced by moving queryWindowSize to update.

Author: zhuxingwei

Runtime/editor/editor_window.cs

@@ -163,6 +163,16 @@ protected virtual TimeSpan getTime() {
 
         protected float deltaTime;
         protected float unscaledDeltaTime;
+        
+        void updatePhysicalSize() {
+            var size = this.queryWindowSize();
+            this._lastWindowWidth = size.x;
+            this._lastWindowHeight = size.y;
+            this._physicalSize = new Size(
+                this._lastWindowWidth * this._devicePixelRatio,
+                this._lastWindowHeight * this._devicePixelRatio);
+        }
+
 
         protected virtual void updateDeltaTime() {
             this.deltaTime = Time.unscaledDeltaTime;
@@ -175,13 +185,13 @@ protected virtual void updateSafeArea() {
         public void onViewMetricsChanged() {
             this._viewMetricsChanged = true;
         }
-
+        
         protected abstract bool hasFocus();
 
         public void OnEnable() {
             this._devicePixelRatio = this.queryDevicePixelRatio();
             this._antiAliasing = this.queryAntiAliasing();
-
+            this.updatePhysicalSize();
             this.updateSafeArea();
             D.assert(this._surface == null);
             this._surface = this.createSurface();
@@ -437,13 +447,8 @@ void _updateScrollInput(float deltaTime) {
         }
 
         public void Update() {
-            if (this._physicalSize == null) {
-                var size = this.queryWindowSize();
-                this._lastWindowWidth = size.x;
-                this._lastWindowHeight = size.y;
-                this._physicalSize = new Size(
-                    this._lastWindowWidth * this._devicePixelRatio,
-                    this._lastWindowHeight * this._devicePixelRatio);
+            if (this._physicalSize == null || this._physicalSize.isEmpty) {
+                this.updatePhysicalSize();
             }
 
             this.updateDeltaTime();

Runtime/engine/UIWidgetsPanel.cs

@@ -65,18 +65,25 @@ public override GUIContent titleContent {
         protected override float queryDevicePixelRatio() {
             return this._uiWidgetsPanel.devicePixelRatio;
         }
-        
+
         protected override int queryAntiAliasing() {
             return this._uiWidgetsPanel.antiAliasing;
         }
 
         protected override Vector2 queryWindowSize() {
             var rect = this._uiWidgetsPanel.rectTransform.rect;
-            var size = new Vector2(rect.width, rect.height) *
-                       this._uiWidgetsPanel.canvas.scaleFactor / this._uiWidgetsPanel.devicePixelRatio;
-            size.x = Mathf.Round(size.x);
-            size.y = Mathf.Round(size.y);
-            return size;
+            // Here we use ReferenceEquals instead of "==" due to
+            // https://blogs.unity3d.com/2014/05/16/custom-operator-should-we-keep-it/
+            // In short, "==" is overloaded for UnityEngine.Object and will bring performance issues
+            if (!ReferenceEquals(this._uiWidgetsPanel.canvas, null)) {
+                var size = new Vector2(rect.width, rect.height) *
+                           this._uiWidgetsPanel.canvas.scaleFactor / this._uiWidgetsPanel.devicePixelRatio;
+                size.x = Mathf.Round(size.x);
+                size.y = Mathf.Round(size.y);
+                return size;
+            }
+
+            return new Vector2(0, 0);
         }
 
         public Offset windowPosToScreenPos(Offset windowPos) {
@@ -134,7 +141,7 @@ protected override void OnEnable() {
 
             this._displayMetrics = DisplayMetricsProvider.provider();
             this._displayMetrics.OnEnable();
-            
+
             this._enteredPointers.Clear();
 
             if (_repaintEvent == null) {
@@ -162,11 +169,9 @@ public float devicePixelRatio {
                     : this._displayMetrics.devicePixelRatio;
             }
         }
-        
+
         public int antiAliasing {
-            get {
-                return this.antiAliasingOverride >= 0 ? this.antiAliasingOverride : QualitySettings.antiAliasing;
-            }
+            get { return this.antiAliasingOverride >= 0 ? this.antiAliasingOverride : QualitySettings.antiAliasing; }
         }
 
         public WindowPadding viewPadding {
@@ -177,17 +182,17 @@ public WindowPadding viewInsets {
             get { return this._displayMetrics.viewInsets; }
         }
 
-        protected override void OnDisable() {	
-            D.assert(this._windowAdapter != null);	
-            this._windowAdapter.OnDisable();	
-            this._windowAdapter = null;	
-            base.OnDisable();	
+        protected override void OnDisable() {
+            D.assert(this._windowAdapter != null);
+            this._windowAdapter.OnDisable();
+            this._windowAdapter = null;
+            base.OnDisable();
         }
-        
+
         protected virtual Widget createWidget() {
             return null;
         }
-        
+
         public void recreateWidget() {
             Widget root;
             using (this._windowAdapter.getScope()) {
@@ -205,12 +210,10 @@ internal void applyRenderTexture(Rect screenRect, Texture texture, Material mat)
         protected virtual void Update() {
             this._displayMetrics.Update();
             UIWidgetsMessageManager.ensureUIWidgetsMessageManagerIfNeeded();
-            
+
 #if UNITY_ANDROID
             if (Input.GetKeyDown(KeyCode.Escape)) {
-                this._windowAdapter.withBinding(() => {
-                    WidgetsBinding.instance.handlePopRoute();
-                });
+                this._windowAdapter.withBinding(() => { WidgetsBinding.instance.handlePopRoute(); });
             }
 #endif
 
@@ -277,6 +280,7 @@ int getMouseButtonDown() {
                     break;
                 }
             }
+
             return InputUtils.getMouseButtonKey(defaultKey);
         }