Revert "Revert "multi page action bar (Goob-Station#469)"" (Goob-Stat…

…ion#1025)
Piras314 · Nov 30, 2024 · 94942d0 · 94942d0
1 parent 3c1fe0e
commit 94942d0
Show file tree

Hide file tree

Showing 11 changed files with 323 additions and 73 deletions.
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
@@ -105,6 +105,11 @@ public static void SetupContexts(IInputContextContainer contexts)
             {
                 common.AddFunction(boundKey);
             }
+            // goobstation
+            foreach (var boundKey in ContentKeyFunctions.GetLoadoutBoundKeys())
+            {
+                common.AddFunction(boundKey);
+            }
 
             var aghost = contexts.New("aghost", "common");
             aghost.AddFunction(EngineKeyFunctions.MoveUp);

diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -262,6 +262,11 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             {
                 AddButton(boundKey);
             }
+            // goobstation
+            foreach (var boundKey in ContentKeyFunctions.GetLoadoutBoundKeys())
+            {
+                AddButton(boundKey);
+            }
 
             AddHeader("ui-options-header-shuttle");
             AddButton(ContentKeyFunctions.ShuttleStrafeUp);

diff --git a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
@@ -23,8 +23,10 @@
             <!-- Buffer so big votes don't skew it -->
             <Control/>
         </BoxContainer>
-        <BoxContainer Name="VoteMenu" Access="Public" Margin="0 10 0 10" Orientation="Vertical"/>
-        <actions:ActionsBar Name="Actions" Access="Protected" />
+        <BoxContainer Orientation="Horizontal"> <!--goobstation-->
+            <actions:ActionsBar Name="Actions" Access="Protected" />
+            <BoxContainer Name="VoteMenu" Access="Public" Margin="0 10 0 10" Orientation="Vertical"/>
+        </BoxContainer>
     </BoxContainer>
     <widgets:GhostGui Name="Ghost" Access="Protected" />
     <inventory:InventoryGui Name="Inventory" Access="Protected" />

diff --git a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
@@ -22,8 +22,8 @@
             <inventory:InventoryGui Name="Inventory" Access="Protected"/>
             <hotbar:HotbarGui Name="Hotbar" Access="Protected"/>
             <targeting:TargetingControl Name="Targeting" Access="Protected"/> <!-- Shitmed Change -->
-            <BoxContainer Name="TopLeftContainer" Orientation="Vertical">
-                <actions:ActionsBar Name="Actions" Access="Protected" />
+            <BoxContainer Name="TopLeftContainer" Orientation="Horizontal"> <!--goobstation-->
+                <actions:ActionsBar Name="Actions" Access="Protected" /> 
                 <BoxContainer Name="VoteMenu" Access="Public" Orientation="Vertical"/>
             </BoxContainer>
             <alerts:AlertsUI Name="Alerts" Access="Protected" />