[UUM-84357] Fix issues when resizing Main Preview subwindow

Author: dhsavell

Packages/com.unity.shadergraph/Editor/Drawing/Inspector/MasterPreviewView.cs

@@ -1,22 +1,19 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.Eventing.Reader;
 using System.Linq;
 using System.Reflection;
 using UnityEngine;
 using UnityEditor.Graphing;
 using UnityEditor.Graphing.Util;
-using UnityEditor.ShaderGraph.Internal;
+using UnityEditor.ShaderGraph.Drawing.Interfaces;
 using Object = UnityEngine.Object;
 
 using UnityEditor.UIElements;
 using UnityEngine.UIElements;
-using UnityEngine.UIElements.StyleSheets;
-using UnityEditor.SearchService;
 
 namespace UnityEditor.ShaderGraph.Drawing.Inspector
 {
-    class MasterPreviewView : VisualElement
+    class MasterPreviewView : VisualElement, ISGResizable
     {
         PreviewManager m_PreviewManager;
         GraphData m_Graph;
@@ -34,14 +31,7 @@ public Image previewTextureView
 
         Mesh m_PreviousMesh;
 
-        bool m_RecalculateLayout;
-
-        ResizeBorderFrame m_PreviewResizeBorderFrame;
-
-        public ResizeBorderFrame previewResizeBorderFrame
-        {
-            get { return m_PreviewResizeBorderFrame; }
-        }
+        ResizableElement m_ResizableElement;
 
         VisualElement m_Preview;
         Label m_Title;
@@ -54,13 +44,14 @@ public VisualElement preview
         List<string> m_DoNotShowPrimitives = new List<string>(new string[] { PrimitiveType.Plane.ToString() });
         static Type s_ObjectSelector = AppDomain.CurrentDomain.GetAssemblies().SelectMany(x => x.GetTypesOrNothing()).FirstOrDefault(t => t.FullName == "UnityEditor.ObjectSelector");
 
-
         public string assetName
         {
             get { return m_Title.text; }
             set { m_Title.text = value; }
         }
 
+        public Action onResized;
+
         public MasterPreviewView(PreviewManager previewManager, GraphData graph)
         {
             style.overflow = Overflow.Hidden;
@@ -75,14 +66,17 @@ public MasterPreviewView(PreviewManager previewManager, GraphData graph)
                 m_PreviewRenderHandle.onPreviewChanged += OnPreviewChanged;
             }
 
+            var mainContainer = new VisualElement();
+            mainContainer.AddToClassList("mainContainer");
+
             var topContainer = new VisualElement() { name = "top" };
             {
                 m_Title = new Label() { name = "title" };
                 m_Title.text = "Main Preview";
 
                 topContainer.Add(m_Title);
             }
-            Add(topContainer);
+            mainContainer.Add(topContainer);
 
             m_Preview = new VisualElement { name = "middle" };
             {
@@ -91,14 +85,14 @@ public MasterPreviewView(PreviewManager previewManager, GraphData graph)
                 preview.Add(m_PreviewTextureView);
                 preview.AddManipulator(new Scrollable(OnScroll));
             }
-            Add(preview);
+            mainContainer.Add(preview);
+
+            Add(mainContainer);
 
-            m_PreviewResizeBorderFrame = new ResizeBorderFrame(this, this) { name = "resizeBorderFrame" };
-            m_PreviewResizeBorderFrame.maintainAspectRatio = true;
-            Add(m_PreviewResizeBorderFrame);
+            m_ResizableElement = new ResizableElement();
+            Add(m_ResizableElement);
 
-            m_RecalculateLayout = false;
-            this.RegisterCallback<GeometryChangedEvent>(OnGeometryChanged);
+            RegisterCallback<GeometryChangedEvent>(OnGeometryChanged);
         }
 
         Image CreatePreview(Texture texture)
@@ -191,15 +185,6 @@ void ChangeMeshCustom()
 
         void OnGeometryChanged(GeometryChangedEvent evt)
         {
-            if (m_RecalculateLayout)
-            {
-                WindowDockingLayout dockingLayout = new WindowDockingLayout();
-                dockingLayout.CalculateDockingCornerAndOffset(layout, parent.layout);
-                dockingLayout.ClampToParentWindow();
-                dockingLayout.ApplyPosition(this);
-                m_RecalculateLayout = false;
-            }
-
             var currentWidth = m_PreviewRenderHandle?.texture != null ? m_PreviewRenderHandle.texture.width : -1;
             var currentHeight = m_PreviewRenderHandle?.texture != null ? m_PreviewRenderHandle.texture.height : -1;
 
@@ -210,7 +195,10 @@ void OnGeometryChanged(GeometryChangedEvent evt)
                 return;
 
             m_PreviewTextureView.style.width = evt.newRect.width;
-            m_PreviewTextureView.style.height = evt.newRect.height - 40.0f;
+
+            const float offsetFromHeader = 40.0f;
+            const float offsetFromMargin = 2 * 6.0f;
+            m_PreviewTextureView.style.height = evt.newRect.height - (offsetFromHeader + offsetFromMargin);
             m_PreviewManager.ResizeMasterPreview(new Vector2(evt.newRect.width, evt.newRect.width));
         }
 
@@ -235,5 +223,17 @@ void OnMouseDragPreviewMesh(Vector2 deltaMouse)
 
             m_PreviewManager.UpdateMasterPreview(ModificationScope.Node);
         }
+
+        public void OnStartResize()
+        {
+        }
+
+        public void OnResized()
+        {
+            onResized?.Invoke();
+        }
+
+        public bool CanResizePastParentBounds() => false;
+        public bool KeepSquareAspect() => true;
     }
 }

Packages/com.unity.shadergraph/Editor/Drawing/Interfaces/IResizable.cs

@@ -6,5 +6,8 @@ interface ISGResizable : IResizable
     {
         // Depending on the return value, the ElementResizer either allows resizing past parent view edge (like in case of StickyNote) or clamps the size at the edges of parent view (like for GraphSubWindows)
         bool CanResizePastParentBounds();
+
+        // If true, element will be kept square when resizing. Otherwise, both axes can be resized freely.
+        bool KeepSquareAspect() => false;
     }
 }