Some UI adjustments and layout fixes

Author: sinai-dev

src/UI/Inspectors/GameObjectInspector.cs

@@ -18,6 +18,8 @@ public class GameObjectInspector : InspectorBase
     {
         public GameObject GOTarget => Target as GameObject;
 
+        public GameObject Content;
+
         public GameObjectControls GOControls;
 
         public TransformTree TransformTree;
@@ -217,11 +219,17 @@ private void OnAddComponentClicked(string input)
         public override GameObject CreateContent(GameObject parent)
         {
             UIRoot = UIFactory.CreateVerticalGroup(Pool<GameObjectInspector>.Instance.InactiveHolder,
-                "GameObjectInspector", true, true, true, true, 5, new Vector4(4, 4, 4, 4), new Color(0.065f, 0.065f, 0.065f));
+                "GameObjectInspector", true, false, true, true, 5, new Vector4(4, 4, 4, 4), new Color(0.065f, 0.065f, 0.065f));
+
+            var scrollObj = UIFactory.CreateScrollView(UIRoot, "GameObjectInspector", out Content, out var scrollbar, 
+                new Color(0.065f, 0.065f, 0.065f));
+            UIFactory.SetLayoutElement(scrollObj, minHeight: 300, flexibleWidth: 9999, flexibleHeight: 1);
+
+            UIFactory.SetLayoutGroup<VerticalLayoutGroup>(Content, spacing: 3, padTop: 2, padBottom: 2, padLeft: 2, padRight: 2);
 
             // Construct GO Controls
             GOControls = new GameObjectControls(this);
-
+            
             ConstructLists();
 
             return UIRoot;
@@ -231,9 +239,12 @@ public override GameObject CreateContent(GameObject parent)
 
         private void ConstructLists()
         {
-            var listHolder = UIFactory.CreateUIObject("ListTitles", UIRoot);
+            var listHolder = UIFactory.CreateUIObject("ListHolders", UIRoot);
             UIFactory.SetLayoutGroup<HorizontalLayoutGroup>(listHolder, false, true, true, true, 8, 2, 2, 2, 2);
-            UIFactory.SetLayoutElement(listHolder, flexibleWidth: 9999, flexibleHeight: 9999);
+            UIFactory.SetLayoutElement(listHolder, minHeight: 350, flexibleWidth: 9999, flexibleHeight: 9999);
+            //var listRect = listHolder.GetComponent<RectTransform>();
+            //listRect.anchorMin = new Vector2(0, 1);
+            //listRect.anchorMax = new Vector2(1, 1);
 
             // Left group (Children)
 
@@ -268,7 +279,7 @@ private void ConstructLists()
 
             // Right group (Components)
 
-            var rightGroup = UIFactory.CreateUIObject("ChildrenGroup", listHolder);
+            var rightGroup = UIFactory.CreateUIObject("ComponentGroup", listHolder);
             UIFactory.SetLayoutElement(rightGroup, flexibleWidth: 9999, flexibleHeight: 9999);
             UIFactory.SetLayoutGroup<VerticalLayoutGroup>(rightGroup, false, false, true, true, 2);
 

src/UI/Inspectors/GameObjectWidgets/ComponentList.cs

@@ -99,11 +99,14 @@ private void SetComponentCell(ComponentCell cell, int index)
             {
                 cell.BehaviourToggle.interactable = true;
                 cell.BehaviourToggle.Set(comp.TryCast<Behaviour>().enabled, false);
+                cell.BehaviourToggle.graphic.color = new Color(0.8f, 1, 0.8f, 0.3f);
             }
             else
             {
                 cell.BehaviourToggle.interactable = false;
-                cell.BehaviourToggle.Set(false, false);
+                cell.BehaviourToggle.Set(true, false);
+                //RuntimeProvider.Instance.SetColorBlock(cell.BehaviourToggle,)
+                cell.BehaviourToggle.graphic.color = new Color(0.2f, 0.2f, 0.2f); 
             }
 
             // if component is the first index it must be the transform, dont show Destroy button for it.

src/UI/Inspectors/GameObjectWidgets/GameObjectControls.cs

@@ -196,6 +196,8 @@ private void OnPathEndEdit(string input)
 
         private void DoSetParent(Transform transform)
         {
+            ExplorerCore.Log($"Setting target's transform parent to: {(transform == null ? "null" : $"'{transform.name}'")}");
+
             if (GOTarget.GetComponent<RectTransform>())
                 GOTarget.transform.SetParent(transform, false);
             else
@@ -434,9 +436,10 @@ public void UpdateVectorSlider()
 
         private void ConstructTopInfo()
         {
-            var topInfoHolder = UIFactory.CreateVerticalGroup(Parent.UIRoot, "TopInfoHolder", false, false, true, true, 3, 
+            var topInfoHolder = UIFactory.CreateVerticalGroup(Parent.Content, "TopInfoHolder", false, false, true, true, 3, 
                 new Vector4(3, 3, 3, 3), new Color(0.1f, 0.1f, 0.1f), TextAnchor.MiddleLeft);
-            UIFactory.SetLayoutElement(topInfoHolder, minHeight: 25, flexibleWidth: 9999);
+            UIFactory.SetLayoutElement(topInfoHolder, minHeight: 100, flexibleWidth: 9999);
+            topInfoHolder.AddComponent<ContentSizeFitter>().verticalFit = ContentSizeFitter.FitMode.PreferredSize;
 
             // first row (parent, path)
 
@@ -449,11 +452,16 @@ private void ConstructTopInfo()
             UIFactory.SetLayoutElement(ViewParentButton.Component.gameObject, minHeight: 25, minWidth: 100);
             ViewParentButton.OnClick += OnViewParentClicked;
 
-            this.PathInput = UIFactory.CreateInputField(firstRow, "PathInput", "Enter a GameObject name or path...");
+            this.PathInput = UIFactory.CreateInputField(firstRow, "PathInput", "...");
             PathInput.Component.textComponent.color = Color.grey;
+            PathInput.Component.textComponent.fontSize = 14;
             UIFactory.SetLayoutElement(PathInput.UIRoot, minHeight: 25, minWidth: 100, flexibleWidth: 9999);
             PathInput.Component.lineType = InputField.LineType.MultiLineSubmit;
 
+            //var pathApplyBtn = UIFactory.CreateButton(firstRow, "PathButton", "Set Parent Path", new Color(0.2f, 0.2f, 0.2f));
+            //UIFactory.SetLayoutElement(pathApplyBtn.Component.gameObject, minHeight: 25, minWidth: 120);
+            //pathApplyBtn.OnClick += () => { OnPathEndEdit(PathInput.Text); };
+
             PathInput.Component.onEndEdit.AddListener((string val) => { OnPathEndEdit(val); });
 
             // Title and update row
@@ -597,11 +605,14 @@ private static void GetHideFlagNames()
 
         private void ConstructTransformControls()
         {
-            //var transformGroup = UIFactory.CreateUIObject("TransformGroup", UIRoot);
-            //UIFactory.SetLayoutGroup<VerticalLayoutGroup>(transformGroup, false, false, true, true, 2, 2, 2);
-            var transformGroup = UIFactory.CreateVerticalGroup(Parent.UIRoot, "TransformControls", false, false, true, true, 2,
+            var transformGroup = UIFactory.CreateVerticalGroup(Parent.Content, "TransformControls", false, false, true, true, 2,
                 new Vector4(2, 2, 0, 0), new Color(0.1f, 0.1f, 0.1f));
-            UIFactory.SetLayoutElement(transformGroup, minHeight: 25, flexibleWidth: 9999);
+            UIFactory.SetLayoutElement(transformGroup, minHeight: 100, flexibleWidth: 9999);
+            //transformGroup.SetActive(false);
+            //var groupRect = transformGroup.GetComponent<RectTransform>();
+            //groupRect.anchorMin = new Vector2(0, 1);
+            //groupRect.anchorMax = new Vector2(1, 1);
+            //groupRect.SetInsetAndSizeFromParentEdge(RectTransform.Edge.Top, 0, 100);
 
             PositionControl = AddTransformRow(transformGroup, "Position:", TransformType.Position);
             LocalPositionControl = AddTransformRow(transformGroup, "Local Position:", TransformType.LocalPosition);

src/UI/Panels/CSConsolePanel.cs

@@ -124,7 +124,7 @@ public override void ConstructPanelContent()
 
             int fontSize = 16;
 
-            var inputObj = UIFactory.CreateSrollInputField(this.content, "ConsoleInput", ConsoleController.STARTUP_TEXT, out var inputScroller, fontSize);
+            var inputObj = UIFactory.CreateScrollInputField(this.content, "ConsoleInput", ConsoleController.STARTUP_TEXT, out var inputScroller, fontSize);
             InputScroll = inputScroller;
             ConsoleController.defaultInputFieldAlpha = Input.Component.selectionColor.a;
             Input.OnValueChanged += InvokeOnValueChanged;

src/UI/Panels/InspectorPanel.cs

@@ -19,7 +19,7 @@ public class InspectorPanel : UIPanel
         public override string Name => "Inspector";
         public override UIManager.Panels PanelType => UIManager.Panels.Inspector;
         public override bool ShouldSaveActiveState => false;
-        public override int MinWidth => 800;
+        public override int MinWidth => 810;
         public override int MinHeight => 350;
 
         public GameObject NavbarHolder;