From 20c93b8f9c328264c1904c35cdcbbc780859a193 Mon Sep 17 00:00:00 2001
From: ntr <ntr@mnml.gg>
Date: Mon, 4 Sep 2023 18:04:40 +1000
Subject: [PATCH] came good pausechamp!

---
 Assets/Src/UI/Menu.uss        | 13 ++++++-------
 Assets/Src/UI/Menu.uxml       | 26 ++++++++++++++------------
 Assets/Src/UI/MenuControls.cs |  2 +-
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/Assets/Src/UI/Menu.uss b/Assets/Src/UI/Menu.uss
index 0cd8a45..4590532 100644
--- a/Assets/Src/UI/Menu.uss
+++ b/Assets/Src/UI/Menu.uss
@@ -9,12 +9,12 @@
     height: 256px;
 }
 
-#settings {
-    padding-left: 25px;
-}
-
-#tracksCtr {
-    padding-left: 25px;
+#body {
+    flex-basis: 50%;
+    flex-grow: 0;
+    margin-right: 24px;
+    margin-left: 24px;
+    margin-bottom: 24px;
 }
 
 Button {
@@ -22,5 +22,4 @@ Button {
     color: rgb(255, 255, 255);
     border-radius: 5px;
     border-width: 3px;
-    width: 33%;
 }
diff --git a/Assets/Src/UI/Menu.uxml b/Assets/Src/UI/Menu.uxml
index 10d7301..21249a2 100644
--- a/Assets/Src/UI/Menu.uxml
+++ b/Assets/Src/UI/Menu.uxml
@@ -3,19 +3,21 @@
     <Style src="project://database/Assets/Src/UI/Global.uss?fileID=7433441132597879392&amp;guid=000591923dc977463bf0fd9f4e7d463e&amp;type=3#Global" />
     <ui:VisualElement name="main" class="nav" style="flex-grow: 1;">
         <ui:VisualElement name="logo" />
-        <ui:VisualElement name="tracksCtr" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0);">
-            <ui:Label text="TRACK" display-tooltip-when-elided="true" name="Track" style="-unity-font: url(&apos;project://database/Assets/UI%20Toolkit/Fonts/Jura-DemiBold.otf?fileID=12800000&amp;guid=1d103e83da4f14189b3e8b0b865eca3d&amp;type=3#Jura-DemiBold&apos;); -unity-font-style: bold;" />
-            <ui:VisualElement name="tracks">
-                <ui:Button text="sr_junglism" display-tooltip-when-elided="true" />
-                <ui:Button text="sr_silverstorage" display-tooltip-when-elided="true" />
+        <ui:VisualElement name="body" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); width: 50%;">
+            <ui:VisualElement name="tracksCtr" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0);">
+                <ui:Label text="TRACK" display-tooltip-when-elided="true" name="Track" style="-unity-font: url(&apos;project://database/Assets/UI%20Toolkit/Fonts/Jura-DemiBold.otf?fileID=12800000&amp;guid=1d103e83da4f14189b3e8b0b865eca3d&amp;type=3#Jura-DemiBold&apos;); -unity-font-style: bold;" />
+                <ui:VisualElement name="tracks">
+                    <ui:Button text="sr_junglism" display-tooltip-when-elided="true" />
+                    <ui:Button text="sr_silverstorage" display-tooltip-when-elided="true" />
+                </ui:VisualElement>
             </ui:VisualElement>
+            <ui:VisualElement name="settings" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); flex-direction: column; display: flex; visibility: visible;">
+                <ui:Label tabindex="-1" text="SETTINGS" display-tooltip-when-elided="true" style="-unity-font-style: bold; align-items: auto;" />
+                <ui:Slider label="View Sensitivity" value="1" high-value="3" name="viewSens" low-value="0.1" show-input-field="false" style="width: 100%;" />
+                <ui:Label tabindex="-1" text="Label" display-tooltip-when-elided="true" name="viewSensLabel" style="-unity-text-align: upper-right; align-self: flex-end;" />
+                <ui:Toggle label="Invert Y" name="invertY" tooltip="Invert Y Axis Controls" value="false" />
+            </ui:VisualElement>
+            <ui:Button text="EXIT" display-tooltip-when-elided="true" name="exit" tabindex="2" class="exit" />
         </ui:VisualElement>
-        <ui:VisualElement name="settings" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); flex-direction: column; display: flex; visibility: visible; align-items: flex-start; width: 33%;">
-            <ui:Label tabindex="-1" text="SETTINGS" display-tooltip-when-elided="true" style="-unity-font-style: bold;" />
-            <ui:Slider label="View Sensitivity" value="1" high-value="3" name="mouseSens" low-value="0.1" show-input-field="false" style="width: 100%;" />
-            <ui:Label tabindex="-1" text="Label" display-tooltip-when-elided="true" name="viewSensLabel" style="-unity-text-align: upper-right; align-self: flex-end;" />
-            <ui:Toggle label="Invert Y" name="invertY" tooltip="Invert Y Axis Controls" />
-        </ui:VisualElement>
-        <ui:Button text="EXIT" display-tooltip-when-elided="true" name="exit" tabindex="2" style="flex-shrink: 1; margin-left: 25px; margin-bottom: 24px;" />
     </ui:VisualElement>
 </ui:UXML>
diff --git a/Assets/Src/UI/MenuControls.cs b/Assets/Src/UI/MenuControls.cs
index 7834834..7bc7785 100644
--- a/Assets/Src/UI/MenuControls.cs
+++ b/Assets/Src/UI/MenuControls.cs
@@ -115,7 +115,7 @@ public class MenuControls : MonoBehaviour {
     void BindSettings() {
         Debug.Log("Setting controls change callbacks");
         invertYToggle = menuDoc.rootVisualElement.Q<Toggle>("invertY");
-        viewSensSlider = menuDoc.rootVisualElement.Q<Slider>("mouseSens");
+        viewSensSlider = menuDoc.rootVisualElement.Q<Slider>("viewSens");
         viewSensLabel = menuDoc.rootVisualElement.Q<Label>("viewSensLabel");
 
         viewSensLabel.text = $"{viewSensSlider.value:0.00}";