Changes for 1.0.6

Added tracker manually to avoid submodule conflicts for now Reduced ui size Added resize option
e-ucm · Jan 22, 2020 · 32adddc · 32adddc
1 parent 11bd68c
commit 32adddc
Show file tree

Hide file tree

Showing 74 changed files with 10,772 additions and 40 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/Assets/uAdventure/Editor/PreviewLayoutWindow.cs b/Assets/uAdventure/Editor/PreviewLayoutWindow.cs
@@ -22,6 +22,11 @@ protected PreviewLayoutWindow(Rect rect, GUIContent content, GUIStyle style, par
             PreviewTitle = "ImageAssets.Preview".Traslate();
             Margin = 30;
             LeaveWindowSpace = true;
+            if (previewResizer == null)
+            {
+                previewResizer = new PreviewResizer();
+                previewResizer.Init("Preview");
+            }
         }
 
         /** Callback for window destroy */
@@ -45,6 +50,10 @@ protected void OnDestroy()
         private Vector2 scroll;
         private bool useScroll = false;
 
+        private static PreviewResizer previewResizer;
+        private static float previewHeight;
+        private Vector2 topScroll;
+
         // ######################## PROPERTIES ###########################
 
         /** Position of the preview inspector window */
@@ -123,14 +132,18 @@ protected virtual void ApplicationUpdate()
         /** Called to draw the main Extension window content */
         public override void Draw(int aID)
         {
+            topScroll = EditorGUILayout.BeginScrollView(topScroll, GUILayout.Height(m_Rect.height - previewHeight - 25));
             DrawInspector();
+            EditorGUILayout.EndScrollView();
 
             DrawPreviewHeader();
-            var auxRect = EditorGUILayout.BeginVertical("preBackground", GUILayout.ExpandWidth(true), GUILayout.ExpandHeight(true));
+
+            GUILayout.Box("", "preBackground", GUILayout.ExpandWidth(true), GUILayout.Height(previewHeight - 35));
             {
-
+                var auxRect = GUILayoutUtility.GetLastRect();
                 if (Event.current.type == EventType.Repaint)
                 {
+                    //auxRect.height = previewHeight;
                     areaRect = auxRect;
 
                     auxRect.position = Vector2.zero;
@@ -163,7 +176,7 @@ public override void Draw(int aID)
                             case Corner.BottomLeft:
                             case Corner.TopLeft:
                                 {
-                                    var reduction = (windowRect.width + 10) * Mathf.Clamp01(1f - (Vector2.Distance(windowRect.position, corner.Value) / (previewRect.width / 3f)));
+                                    var reduction = (windowRect.width + 10) * Mathf.Clamp01(1f - (Vector2.Distance(windowRect.position, corner.Value) / (previewRect.width / 4f)));
 
                                     viewport.x += reduction;
                                     viewport.width -= reduction;
@@ -173,7 +186,7 @@ public override void Draw(int aID)
                             case Corner.BottomRight:
                             case Corner.TopRight:
                                 {
-                                    var reduction = (windowRect.width + 10) * Mathf.Clamp01(1f - (Vector2.Distance(windowRect.position, corner.Value) / (previewRect.width / 3f)));
+                                    var reduction = (windowRect.width + 10) * Mathf.Clamp01(1f - (Vector2.Distance(windowRect.position, corner.Value) / (previewRect.width / 4f)));
                                     viewport.width -= reduction;
                                 }
                                 break;
@@ -244,7 +257,6 @@ public override void Draw(int aID)
                 GUILayout.EndArea();
             }
 
-            EditorGUILayout.EndVertical();
 
         }
 
@@ -254,8 +266,16 @@ protected virtual void DrawInspector() { }
         /** Called to draw the preview header */
         protected virtual void DrawPreviewHeader()
         {
-            GUILayout.Space(10);
             GUILayout.Label(PreviewTitle, "preToolbar", GUILayout.ExpandWidth(true));
+            var lastRect = GUILayoutUtility.GetLastRect();
+            var window = m_Rect;
+            window.height += 35;
+
+            previewHeight = previewResizer.ResizeHandle(window, 50, 50, 20, lastRect);
+            if (!previewResizer.GetExpanded())
+            {
+                previewResizer.ToggleExpanded();
+            }
         }
 
         /** Called to draw the preview content */