From 2da293ab21c45e410fe393d7c1f782db26c949d6 Mon Sep 17 00:00:00 2001
From: sinaioutlander <49360850+sinaioutlander@users.noreply.github.com>
Date: Fri, 23 Oct 2020 19:55:02 +1100
Subject: [PATCH] A bit more progress, got a good framework for the UI going
 now.

---
 src/ExplorerCore.cs         |   4 +-
 src/UI/Main/MainMenu.cs     | 286 +++++++++++++++++++++---------------
 src/UI/Main/PanelDragger.cs |  65 +++-----
 src/UI/UIFactory.cs         | 127 ++++++++++------
 src/UI/UIManager.cs         |   8 +-
 5 files changed, 275 insertions(+), 215 deletions(-)

diff --git a/src/ExplorerCore.cs b/src/ExplorerCore.cs
index 3824aa6..346690b 100644
--- a/src/ExplorerCore.cs
+++ b/src/ExplorerCore.cs
@@ -1,10 +1,10 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Linq;
 using ExplorerBeta.Config;
 using ExplorerBeta.Input;
 using ExplorerBeta.UI;
 using UnityEngine;
-using UnityEngine.EventSystems;
 
 namespace ExplorerBeta
 {
diff --git a/src/UI/Main/MainMenu.cs b/src/UI/Main/MainMenu.cs
index 55bcbaf..96162fb 100644
--- a/src/UI/Main/MainMenu.cs
+++ b/src/UI/Main/MainMenu.cs
@@ -10,14 +10,20 @@ using ExplorerBeta.UI.Shared;
 
 namespace ExplorerBeta.UI.Main
 {
-    // TODO REMAKE THIS
-
     public class MainMenu
     {
         public static MainMenu Instance { get; set; }
 
         public PanelDragger Dragger { get; private set; }
+
         public GameObject MainPanel { get; private set; }
+        public GameObject PageViewport { get; private set; }
+
+        // Navbar buttons
+        private Button m_lastNavButtonPressed;
+        private readonly Color m_navButtonNormal = new Color(65f/255f, 66f/255f, 66f/255f);
+        private readonly Color m_navButtonHighlight = new Color(50f/255f, 195f/255f, 50f/255f);
+        private readonly Color m_navButtonSelected = new Color(60f/255f, 120f/255f, 60f/255f);
 
         public MainMenu()
         {
@@ -29,150 +35,186 @@ namespace ExplorerBeta.UI.Main
 
             Instance = this;
 
-            MainPanel = CreateBasePanel("MainMenu");
-            CreateTitleBar();
-            CreateNavbar();
-            CreateViewArea();
+            ConstructMenu();
         }
 
         public void Update()
         {
-
+            // todo
         }
 
-        private void TestButtonCallback()
+        #region UI Interaction Callbacks
+
+        private void OnPressHide()
         {
-            //if (EventSystem.current != EventSys)
-            //    return;
+            ExplorerCore.ShowMenu = false;
+        }
 
-            var go = EventSystem.current.currentSelectedGameObject;
-            if (!go)
-                return;
+        private void OnNavButtonPressed(string pageName, Button button)
+        {
+            ExplorerCore.Log($"Pressed '{pageName}'");
 
-            var name = go.name;
-            if (go.GetComponentInChildren<Text>() is Text text)
+            var colors = button.colors;
+            colors.normalColor = m_navButtonSelected;
+            colors.selectedColor = m_navButtonSelected;
+            button.colors = colors;
+
+            if (m_lastNavButtonPressed && m_lastNavButtonPressed != button)
             {
-                name = text.text;
+                var oldColors = m_lastNavButtonPressed.colors;
+                oldColors.normalColor = m_navButtonNormal;
+                oldColors.selectedColor = m_navButtonNormal;
+                m_lastNavButtonPressed.colors = oldColors;
             }
-            ExplorerCore.Log($"{Time.time} | Pressed {name ?? "null"}");
 
-            if (name == "X")
+            m_lastNavButtonPressed = button;            
+        }
+
+        #endregion
+
+        #region UI Construction
+
+        private void ConstructMenu()
+        {
+            MainPanel = UIFactory.CreatePanel(UIManager.CanvasRoot, "MainMenu", out GameObject content);
+
+            var panelRect = MainPanel.GetComponent<RectTransform>();
+            panelRect.anchorMin = new Vector2(0.25f, 0.1f);
+            panelRect.anchorMax = new Vector2(0.75f, 0.95f);
+
+            ConstructTitleBar(content);
+
+            ConstructNavbar(content);
+
+            ConstructMainViewport(content);
+        }
+
+        private void ConstructTitleBar(GameObject content)
+        {
+            // Core title bar holder
+
+            var titleBar = UIFactory.CreateHorizontalGroup(content);
+
+            var titleGroup = titleBar.GetComponent<HorizontalLayoutGroup>();
+            titleGroup.childControlHeight = true;
+            titleGroup.childControlWidth = true;
+            titleGroup.childForceExpandHeight = true;
+            titleGroup.childForceExpandWidth = true;
+            titleGroup.padding.left = 15;
+            titleGroup.padding.right = 3;
+            titleGroup.padding.top = 3;
+            titleGroup.padding.bottom = 3;
+
+            var titleLayout = titleBar.AddComponent<LayoutElement>();
+            titleLayout.minHeight = 35;
+            titleLayout.flexibleHeight = 0;
+
+            // Explorer label
+
+            var textObj = UIFactory.CreateLabel(titleBar, TextAnchor.MiddleLeft);
+
+            var text = textObj.GetComponent<Text>();
+            text.text = $"<b>Explorer</b> <i>v{ExplorerCore.VERSION}</i>";
+            text.resizeTextForBestFit = true;
+            text.resizeTextMinSize = 12;
+            text.resizeTextMaxSize = 20;
+
+            var textLayout = textObj.AddComponent<LayoutElement>();
+            textLayout.flexibleWidth = 50;
+
+            // Add PanelDragger using the label object
+
+            Dragger = new PanelDragger(titleBar.GetComponent<RectTransform>(), MainPanel.GetComponent<RectTransform>());
+
+            // Hide button
+
+            var hideBtnObj = UIFactory.CreateButton(titleBar);
+
+            var hideBtn = hideBtnObj.GetComponent<Button>();
+            hideBtn.onClick = new Button.ButtonClickedEvent();
+            hideBtn.onClick.AddListener(new Action(OnPressHide));
+            var colorBlock = hideBtn.colors;
+            colorBlock.normalColor = new Color(65f/255f, 23f/255f, 23f/255f);
+            colorBlock.pressedColor = new Color(35f/255f, 10f/255f, 10f/255f);
+            colorBlock.highlightedColor = new Color(156f/255f, 0f, 0f);
+            hideBtn.colors = colorBlock;
+
+            var btnLayout = hideBtnObj.AddComponent<LayoutElement>();
+            btnLayout.minWidth = 90;
+            btnLayout.flexibleWidth = 2;
+
+            var hideText = hideBtnObj.GetComponentInChildren<Text>();
+            // Todo use actual keycode from mod config, update on OnSettingsChanged or whatever
+            hideText.text = "Hide (F7)";
+            hideText.color = Color.white;
+            hideText.resizeTextForBestFit = true;
+            hideText.resizeTextMinSize = 8;
+            hideText.resizeTextMaxSize = 16;
+        }
+
+        private void ConstructNavbar(GameObject content)
+        {
+            // Todo add pages programatically
+
+            var navbarObj = UIFactory.CreateHorizontalGroup(content);
+
+            var navGroup = navbarObj.GetComponent<HorizontalLayoutGroup>();
+            navGroup.padding.left = 3;
+            navGroup.padding.right = 3;
+            navGroup.padding.top = 3;
+            navGroup.padding.bottom = 3;
+            navGroup.spacing = 5;
+            navGroup.childControlHeight = true;
+            navGroup.childControlWidth = true;
+            navGroup.childForceExpandHeight = true;
+            navGroup.childForceExpandWidth = true;
+
+            var navLayout = navbarObj.AddComponent<LayoutElement>();
+            navLayout.minHeight = 35;
+            navLayout.flexibleHeight = 0;
+
+            // todo use page enum instead
+            var names = new string[] { "Home", "Search", "C# Console", "Options/Misc" };
+            for (int i = 0; i < 4; i++)
             {
-                ExplorerCore.ShowMenu = false;
-            }
-        }
+                var btnObj = UIFactory.CreateButton(navbarObj);
+                var btn = btnObj.GetComponent<Button>();
 
-        #region UI Generator
+                var name = names[i];
 
-        public virtual GameObject CreateBasePanel(string name)
-        {
-            var basePanel = UIFactory.CreatePanel(UIManager.CanvasRoot.gameObject, name);
-            var panelRect = basePanel.GetComponent<RectTransform>();
-            panelRect.anchorMin = new Vector2(0.327f, 0.0967f);
-            panelRect.anchorMax = new Vector2(0.672f, 0.904f);
-            panelRect.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, 620f);
-            panelRect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, 800f);
+                btn.onClick.AddListener(new Action(() => { OnNavButtonPressed(name, btn); }));
 
-            return basePanel;
-        }
-
-        private void CreateTitleBar()
-        {
-            // Make the horizontal group for window title area
-            var titleGroup = UIFactory.CreateHorizontalGroup(MainPanel);
-            var titleRect = titleGroup.GetComponent<RectTransform>();
-            titleRect.anchorMin = new Vector2(0.005f, 0.96f);
-            titleRect.anchorMax = new Vector2(0.995f, 0.994f);
-            titleRect.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, 613);
-            titleRect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, 30);
-
-            var group = titleGroup.GetComponent<HorizontalLayoutGroup>();
-            group.childControlWidth = true;
-            //group.childScaleWidth = true;
-            group.childForceExpandHeight = true;
-            group.childForceExpandWidth = true;
-
-            // Create window title
-            var titleLabel = UIFactory.CreateLabel(titleGroup, TextAnchor.MiddleCenter);
-            var labelText = titleLabel.GetComponent<Text>();
-            labelText.text = ExplorerCore.NAME;
-            labelText.fontSize = 15;
-            var labelRect = labelText.GetComponent<RectTransform>();
-            labelRect.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, 575);
-            labelRect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, 25);
-
-            // Add drag handler (on Title label)
-            Dragger = new PanelDragger(titleLabel.transform.TryCast<RectTransform>(),
-                                        MainPanel.GetComponent<RectTransform>());
-
-            // Create X Button
-            var exitBtnObj = UIFactory.CreateButton(titleGroup);
-            var exitBtn = exitBtnObj.GetComponentInChildren<Button>();
-            exitBtn.onClick.AddListener(new Action(TestButtonCallback));
-            var exitBtnText = exitBtnObj.GetComponentInChildren<Text>();
-            exitBtnText.text = "X";
-            exitBtnText.fontSize = 14;
-            var exitBtnRect = exitBtnObj.GetComponent<RectTransform>();
-            exitBtnRect.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, 40f);
-            exitBtnRect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, 25f);
-        }
-
-        private void CreateNavbar()
-        {
-            // Make the horizontal group for the nav bar
-            var navArea = UIFactory.CreateHorizontalGroup(MainPanel);
-            var group = navArea.GetComponent<HorizontalLayoutGroup>();
-            group.childAlignment = TextAnchor.MiddleLeft;
-            group.spacing = 5;
-            group.childForceExpandWidth = true;
-            group.childForceExpandHeight = true;
-            group.childControlWidth = true;
-            group.spacing = 5;
-
-            var padding = new RectOffset();
-            padding.left = 5;
-            padding.right = 5;
-            padding.top = 3;
-            padding.bottom = 3;
-            group.padding = padding;
-
-            var navRect = navArea.GetComponent<RectTransform>();
-            navRect.anchorMin = new Vector2(0.005f, 0.93f);
-            navRect.anchorMax = new Vector2(0.995f, 0.97f);
-            var pos = navRect.localPosition;
-            pos.y = 348;
-            navRect.localPosition = pos;
-            navRect.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, 613);
-            navRect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, 30);
-
-            // Add the buttons for pages (this should be done programmatically)
-            var names = new string[] { "Scenes", "Search", "C# Console", "Options" };
-            for (int i = 0; i < names.Length; i++)
-            {
-                var btn = UIFactory.CreateButton(navArea);
-                var text = btn.GetComponentInChildren<Text>();
-                text.text = names[i];
-
-                btn.GetComponent<Button>().onClick.AddListener(new Action(TestButtonCallback));
+                var text = btnObj.GetComponentInChildren<Text>();
+                text.text = name;
 
+                // Set button colors
+                var colorBlock = btn.colors;
                 if (i == 0)
                 {
-                    var image = btn.GetComponentInChildren<Image>();
-                    image.color = new Color(0.1f, 0.35f, 0.1f);
+                    colorBlock.normalColor = m_navButtonSelected;
+                    m_lastNavButtonPressed = btn;
                 }
+                else
+                {
+                    colorBlock.normalColor = m_navButtonNormal;
+                }
+                colorBlock.selectedColor = colorBlock.normalColor;
+                colorBlock.highlightedColor = m_navButtonHighlight;
+                colorBlock.pressedColor = m_navButtonSelected;
+                btn.colors = colorBlock;
             }
         }
 
-        private void CreateViewArea()
+        private void ConstructMainViewport(GameObject content)
         {
-            // Make the vertical group for the viewport
-            var viewGroup = UIFactory.CreateVerticalGroup(MainPanel);
-            var viewRect = viewGroup.GetComponent<RectTransform>();
-            viewRect.anchorMin = new Vector2(0.005f, -0.038f);
-            viewRect.anchorMax = new Vector2(0.995f, 0.954f);
-            viewRect.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, 613);
-            viewRect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, 720f);
-            viewRect.localPosition = new Vector3(0, -35f, 0);
+            var mainObj = UIFactory.CreateHorizontalGroup(content);
+            var mainGroup = mainObj.GetComponent<HorizontalLayoutGroup>();
+            mainGroup.childControlHeight = true;
+            mainGroup.childControlWidth = true;
+            mainGroup.childForceExpandHeight = true;
+            mainGroup.childForceExpandWidth = true;
+
+            PageViewport = mainObj;
         }
 
         #endregion
diff --git a/src/UI/Main/PanelDragger.cs b/src/UI/Main/PanelDragger.cs
index a48e2fe..17af673 100644
--- a/src/UI/Main/PanelDragger.cs
+++ b/src/UI/Main/PanelDragger.cs
@@ -42,6 +42,7 @@ namespace ExplorerBeta.UI
         {
             var rawMousePos = InputManager.MousePosition;
 
+            ResizeTypes type;
             var resizePos = Panel.InverseTransformPoint(rawMousePos);
             var dragPos = DragableArea.InverseTransformPoint(rawMousePos);
 
@@ -60,8 +61,9 @@ namespace ExplorerBeta.UI
                 }
                 else if (MouseInResizeArea(resizePos))
                 {
-                    var type = GetResizeType(resizePos);
-                    OnBeginResize(type);
+                    type = GetResizeType(resizePos);
+                    if (type != ResizeTypes.NONE)
+                        OnBeginResize(type);
                 }
             }
             // If mouse still pressed from last frame
@@ -87,9 +89,8 @@ namespace ExplorerBeta.UI
                 {
                     OnEndResize();
                 }
-                else if (MouseInResizeArea(resizePos))
+                else if (MouseInResizeArea(resizePos) && (type = GetResizeType(resizePos)) != ResizeTypes.NONE)
                 {
-                    var type = GetResizeType(resizePos);
                     OnHoverResize(type);
                 }
                 else if (WasHoveringResize)
@@ -145,7 +146,7 @@ namespace ExplorerBeta.UI
         private ResizeTypes m_lastResizeHoverType;
         private GameObject m_resizeCursorImage;
 
-        private Rect m_cachedOuterResize;
+        private Rect m_resizeRect;
 
         private readonly Dictionary<ResizeTypes, Rect> m_resizeMask = new Dictionary<ResizeTypes, Rect>
         {
@@ -179,47 +180,26 @@ namespace ExplorerBeta.UI
             // to give a bit of buffer and make it easier to use.
 
             // outer rect is the outer-most bounds of our resize area
-            var outer = new Rect();
-            outer.x = Panel.rect.x - halfThick;
-            outer.y = Panel.rect.y - halfThick;
-            outer.width = Panel.rect.width + dblThick;
-            outer.height = Panel.rect.height + dblThick;
-            m_cachedOuterResize = outer;
+            var outer = new Rect(Panel.rect.x - halfThick, 
+                Panel.rect.y - halfThick, 
+                Panel.rect.width + dblThick, 
+                Panel.rect.height + dblThick);
+            m_resizeRect = outer;
 
             // calculate the four cross sections to use as flags
 
-            var bottom = new Rect();
-            bottom.x = outer.x;
-            bottom.y = outer.y;
-            bottom.width = outer.width;
-            bottom.height = RESIZE_THICKNESS;
-            m_resizeMask[ResizeTypes.Bottom] = bottom;
+            m_resizeMask[ResizeTypes.Bottom] = new Rect(outer.x, outer.y, outer.width, RESIZE_THICKNESS);
 
-            var left = new Rect();
-            left.x = outer.x;
-            left.y = outer.y;
-            left.width = RESIZE_THICKNESS;
-            left.height = outer.height;
-            m_resizeMask[ResizeTypes.Left] = left;
+            m_resizeMask[ResizeTypes.Left] = new Rect(outer.x, outer.y, RESIZE_THICKNESS, outer.height);
 
-            var top = new Rect();
-            top.x = outer.x;
-            top.y = outer.y + Panel.rect.height;
-            top.width = outer.width;
-            top.height = RESIZE_THICKNESS;
-            m_resizeMask[ResizeTypes.Top] = top;
+            m_resizeMask[ResizeTypes.Top] = new Rect(outer.x, outer.y + Panel.rect.height, outer.width, RESIZE_THICKNESS);
 
-            var right = new Rect();
-            right.x = outer.x + Panel.rect.width;
-            right.y = outer.y;
-            right.width = RESIZE_THICKNESS;
-            right.height = outer.height;
-            m_resizeMask[ResizeTypes.Right] = right;
+            m_resizeMask[ResizeTypes.Right] = new Rect(outer.x + Panel.rect.width, outer.y, RESIZE_THICKNESS, outer.height);
         }
 
         private bool MouseInResizeArea(Vector2 mousePos)
         {
-            return m_cachedOuterResize.Contains(mousePos) && GetResizeType(mousePos) != ResizeTypes.NONE;
+            return m_resizeRect.Contains(mousePos);
         }
 
         private ResizeTypes GetResizeType(Vector2 mousePos)
@@ -283,13 +263,7 @@ namespace ExplorerBeta.UI
             if (!m_resizeCursorImage)
                 return;
 
-            var t =
-#if CPP
-                UIManager.CanvasRoot.transform.TryCast<RectTransform>();
-#else
-                UIManager.CanvasRoot.transform as RectTransform;
-#endif
-
+            var t = UIManager.CanvasRoot.GetComponent<RectTransform>();
             m_resizeCursorImage.transform.localPosition = t.InverseTransformPoint(InputManager.MousePosition);
         }
 
@@ -357,10 +331,7 @@ namespace ExplorerBeta.UI
             tex.LoadImage(data, false);
             UnityEngine.Object.DontDestroyOnLoad(tex);
 
-            var size = new Rect();
-            size.width = 32;
-            size.height = 32;
-            var sprite = UIManager.CreateSprite(tex, size);
+            var sprite = UIManager.CreateSprite(tex);
             UnityEngine.Object.DontDestroyOnLoad(sprite);
 
             m_resizeCursorImage = new GameObject("ResizeCursorImage");
diff --git a/src/UI/UIFactory.cs b/src/UI/UIFactory.cs
index 2a49c40..cfcd7a3 100644
--- a/src/UI/UIFactory.cs
+++ b/src/UI/UIFactory.cs
@@ -12,7 +12,7 @@ namespace ExplorerBeta.UI
 		private static Vector2 s_ThickElementSize = new Vector2(160f, 30f);
 		private static Vector2 s_ThinElementSize = new Vector2(160f, 20f);
 		//private static Vector2 s_ImageElementSize = new Vector2(100f, 100f);
-		private static Color s_DefaultSelectableColor = new Color(0.3f, 0.3f, 0.3f, 1f);
+		private static Color s_DefaultSelectableColor = new Color(1f, 1f, 1f, 1f);
 		private static Color s_PanelColor = new Color(0.1f, 0.1f, 0.1f, 1.0f);
 		private static Color s_TextColor = new Color(0.95f, 0.95f, 0.95f, 1f);
 
@@ -80,7 +80,7 @@ namespace ExplorerBeta.UI
 			}
 		}
 
-		public static GameObject CreatePanel(GameObject parent, string name)
+		public static GameObject CreatePanel(GameObject parent, string name, out GameObject content)
 		{
 			GameObject panelObj = CreateUIObject($"Panel_{name}", parent, s_ThickElementSize);
 
@@ -91,16 +91,43 @@ namespace ExplorerBeta.UI
 			rect.sizeDelta = Vector2.zero;
 
 			Image image = panelObj.AddComponent<Image>();
-			image.sprite = UIResources.background;
-			image.type = Image.Type.Sliced;
-			image.color = s_PanelColor;
+			image.type = Image.Type.Filled;
+			image.color = new Color(0.05f, 0.05f, 0.05f);
+
+			var group = panelObj.AddComponent<VerticalLayoutGroup>();
+			group.padding.left = 3;
+			group.padding.right = 3;
+			group.padding.bottom = 3;
+			group.padding.top = 3;
+			group.childControlHeight = true;
+			group.childControlWidth = true;
+			group.childForceExpandHeight = true;
+			group.childForceExpandWidth = true;
+
+			content = new GameObject("Content");
+			content.transform.parent = panelObj.transform;
+
+			Image image2 = content.AddComponent<Image>();
+			image2.type = Image.Type.Filled;
+			image2.color = new Color(0.1f, 0.1f, 0.1f);
+
+			var group2 = content.AddComponent<VerticalLayoutGroup>();
+			group2.padding.left = 5;
+			group2.padding.right = 5;
+			group2.padding.bottom = 5;
+			group2.padding.top = 5;
+			group2.spacing = 5;
+			group2.childControlHeight = true;
+			group2.childControlWidth = true;
+			group2.childForceExpandHeight = false;
+			group2.childForceExpandWidth = true;
 
 			return panelObj;
 		}
 
 		public static GameObject CreateVerticalGroup(GameObject parent, Color color = default)
 		{
-			var groupObj = CreateUIObject("HorizontalLayout", parent);
+			var groupObj = CreateUIObject("VerticalLayout", parent);
 
 			var horiGroup = groupObj.AddComponent<VerticalLayoutGroup>();
 			horiGroup.childAlignment = TextAnchor.UpperLeft;
@@ -233,14 +260,13 @@ namespace ExplorerBeta.UI
 			GameObject handleObj = CreateUIObject("Handle", slideAreaObj);
 
 			Image scrollImage = scrollObj.AddComponent<Image>();
-			scrollImage.sprite = UIResources.background;
 			scrollImage.type = Image.Type.Sliced;
-			scrollImage.color = s_DefaultSelectableColor;
+			scrollImage.color = new Color(0.1f, 0.1f, 0.1f);
 
 			Image handleImage = handleObj.AddComponent<Image>();
 			handleImage.sprite = UIResources.standard;
 			handleImage.type = Image.Type.Sliced;
-			handleImage.color = s_DefaultSelectableColor;
+			handleImage.color = new Color(0.4f, 0.4f, 0.4f);
 
 			RectTransform slideAreaRect = slideAreaObj.GetComponent<RectTransform>();
 			slideAreaRect.sizeDelta = new Vector2(-20f, -20f);
@@ -396,8 +422,8 @@ namespace ExplorerBeta.UI
 			templateImage.type = Image.Type.Sliced;
 
 			ScrollRect scrollRect = templateObj.AddComponent<ScrollRect>();
-            scrollRect.content = (RectTransform)contentObj.transform;
-			scrollRect.viewport = (RectTransform)viewportObj.transform;
+            scrollRect.content = contentObj.GetComponent<RectTransform>();
+			scrollRect.viewport = viewportObj.GetComponent<RectTransform>();
 			scrollRect.horizontal = false;
 			scrollRect.movementType = ScrollRect.MovementType.Clamped;
 			scrollRect.verticalScrollbar = scrollbar;
@@ -431,16 +457,16 @@ namespace ExplorerBeta.UI
 			{
 				text = "Option A"
 			});
-			//dropdown.options.Add(new Dropdown.OptionData
-			//{
-			//	text = "Option B"
-			//});
-			//dropdown.options.Add(new Dropdown.OptionData
-			//{
-			//	text = "Option C"
-			//});
+            dropdown.options.Add(new Dropdown.OptionData
+            {
+                text = "Option B"
+            });
+            dropdown.options.Add(new Dropdown.OptionData
+            {
+                text = "Option C"
+            });
 
-			dropdown.RefreshShownValue();
+            dropdown.RefreshShownValue();
 
 			RectTransform labelRect = labelObj.GetComponent<RectTransform>();
 			labelRect.anchorMin = Vector2.zero;
@@ -500,33 +526,50 @@ namespace ExplorerBeta.UI
 			return dropdownObj;
 		}
 
-		public static GameObject CreateScrollView(GameObject parent)
+		public static GameObject CreateScrollView(GameObject parent, out GameObject content)
 		{
-			GameObject scrollObj = CreateUIObject("Scroll View", parent, new Vector2(200f, 200f));
+			GameObject scrollObj = CreateUIObject("Scroll View", parent);
 
 			GameObject viewportObj = CreateUIObject("Viewport", scrollObj);
-			GameObject contentObj = CreateUIObject("Content", viewportObj);
+
+			var viewportGroup = viewportObj.AddComponent<VerticalLayoutGroup>();
+			viewportGroup.childControlHeight = true;
+			viewportGroup.childControlWidth = true;
+			viewportGroup.childForceExpandHeight = true;
+			viewportGroup.childForceExpandWidth = true;
+
+			content = CreateUIObject("Content", viewportObj);
+
+			var contentGroup = content.AddComponent<VerticalLayoutGroup>();
+			contentGroup.padding.left = 5;
+			contentGroup.padding.right = 5;
+			contentGroup.padding.top = 5;
+			contentGroup.padding.bottom = 5;
+			contentGroup.childControlHeight = false;
+			contentGroup.childControlWidth = true;
+			contentGroup.childForceExpandHeight = false;
+			contentGroup.childForceExpandWidth = true;
 
 			GameObject horiScroll = CreateScrollbar(scrollObj);
 			horiScroll.name = "Scrollbar Horizontal";
-			//SetParentAndAlign(scrollbarObj, scrollObj);
+			SetParentAndAlign(horiScroll, scrollObj);
 
-			RectTransform horiRect = horiScroll.GetComponent<RectTransform>();
-			horiRect.anchorMin = Vector2.zero;
-			horiRect.anchorMax = Vector2.right;
-			horiRect.pivot = Vector2.zero;
-			horiRect.sizeDelta = new Vector2(0f, horiRect.sizeDelta.y);
+            RectTransform horiRect = horiScroll.GetComponent<RectTransform>();
+            horiRect.anchorMin = Vector2.zero;
+            horiRect.anchorMax = Vector2.right;
+            horiRect.pivot = Vector2.zero;
+            horiRect.sizeDelta = new Vector2(0f, horiRect.sizeDelta.y);
 
-			GameObject vertScroll = CreateScrollbar(scrollObj);
+            GameObject vertScroll = CreateScrollbar(scrollObj);
 			vertScroll.name = "Scrollbar Vertical";
-			//SetParentAndAlign(vertScroll, scrollObj);
+			SetParentAndAlign(vertScroll, scrollObj);
 			vertScroll.GetComponent<Scrollbar>().SetDirection(Scrollbar.Direction.BottomToTop, true);
 
-			RectTransform vertRect = vertScroll.GetComponent<RectTransform>();
-			vertRect.anchorMin = Vector2.right;
-			vertRect.anchorMax = Vector2.one;
-			vertRect.pivot = Vector2.one;
-			vertRect.sizeDelta = new Vector2(vertRect.sizeDelta.x, 0f);
+            RectTransform vertRect = vertScroll.GetComponent<RectTransform>();
+            vertRect.anchorMin = Vector2.right;
+            vertRect.anchorMax = Vector2.one;
+            vertRect.pivot = Vector2.one;
+            vertRect.sizeDelta = new Vector2(vertRect.sizeDelta.x, 0f);
 
 			RectTransform viewportRect = viewportObj.GetComponent<RectTransform>();
 			viewportRect.anchorMin = Vector2.zero;
@@ -534,21 +577,21 @@ namespace ExplorerBeta.UI
 			viewportRect.sizeDelta = Vector2.zero;
 			viewportRect.pivot = Vector2.up;
 
-			RectTransform contentRect = contentObj.GetComponent<RectTransform>();
+			RectTransform contentRect = content.GetComponent<RectTransform>();
 			contentRect.anchorMin = Vector2.up;
 			contentRect.anchorMax = Vector2.one;
-			contentRect.sizeDelta = new Vector2(0f, 300f);
 			contentRect.pivot = Vector2.up;
 
 			ScrollRect scrollRect = scrollObj.AddComponent<ScrollRect>();
 			scrollRect.content = contentRect;
 			scrollRect.viewport = viewportRect;
 			scrollRect.horizontalScrollbar = horiScroll.GetComponent<Scrollbar>();
-			scrollRect.verticalScrollbar = vertScroll.GetComponent<Scrollbar>();
-			scrollRect.horizontalScrollbarVisibility = ScrollRect.ScrollbarVisibility.AutoHideAndExpandViewport;
-			scrollRect.verticalScrollbarVisibility = ScrollRect.ScrollbarVisibility.AutoHideAndExpandViewport;
-			scrollRect.horizontalScrollbarSpacing = -3f;
+            scrollRect.verticalScrollbar = vertScroll.GetComponent<Scrollbar>();
+            scrollRect.horizontalScrollbarVisibility = ScrollRect.ScrollbarVisibility.AutoHideAndExpandViewport;
+            scrollRect.verticalScrollbarVisibility = ScrollRect.ScrollbarVisibility.AutoHideAndExpandViewport;
+            scrollRect.horizontalScrollbarSpacing = -3f;
 			scrollRect.verticalScrollbarSpacing = -3f;
+			scrollRect.scrollSensitivity = 25;
 
 			Image scrollImage = scrollObj.AddComponent<Image>();
 			scrollImage.sprite = UIResources.background;
diff --git a/src/UI/UIManager.cs b/src/UI/UIManager.cs
index d45203a..80d2776 100644
--- a/src/UI/UIManager.cs
+++ b/src/UI/UIManager.cs
@@ -20,7 +20,7 @@ namespace ExplorerBeta.UI
         public static void Init()
         {
             var res = UIFactory.UIResources = new UIFactory.Resources();
-            var bg = CreateSprite(MakeSolidTexture(new Color(0.1f, 0.1f, 0.1f), 1, 1), new Rect(0, 0, 1, 1));
+            var bg = CreateSprite(MakeSolidTexture(new Color(0.16f, 0.16f, 0.16f), 1, 1));
             res.background = bg;
 
             // Create core UI Canvas and Event System handler
@@ -95,11 +95,15 @@ namespace ExplorerBeta.UI
             // todo
         }
 
-        public static Sprite CreateSprite(Texture2D tex, Rect size)
+        public static Sprite CreateSprite(Texture2D tex, Rect size = default)
         {
 #if CPP
             var pivot = Vector2.zero;
             var border = Vector4.zero;
+
+            if (size == default)
+                size = new Rect(0, 0, tex.width, tex.height);
+
             return Sprite.CreateSprite_Injected(tex, ref size, ref pivot, 100f, 0u, SpriteMeshType.Tight, ref border, false);
 #else
             return Sprite.Create(tex, size, Vector2.zero);