Fix action numbers (/handle UI default theme update) (#15840)

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

diff --git a/Content.Client/UserInterface/Controls/SlotControl.cs b/Content.Client/UserInterface/Controls/SlotControl.cs
index 207e3b435700ddba5bcfe69e66a9dd2431227a89..36ffacc5c554dbb8268c86f82d19ad4b73b0e030 100644 (file)
--- a/Content.Client/UserInterface/Controls/SlotControl.cs
+++ b/Content.Client/UserInterface/Controls/SlotControl.cs
@@ -232,6 +232,7 @@ namespace Content.Client.UserInterface.Controls
 
         protected override void OnThemeUpdated()
         {
+            base.OnThemeUpdated();
             StorageButton.TextureNormal = Theme.ResolveTexture(_storageTexturePath);
             ButtonRect.Texture = Theme.ResolveTexture(_buttonTexturePath);
             HighlightRect.Texture = Theme.ResolveTexture(_highlightTexturePath);

diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
index e032b19534dcf9552ca529524a031afe7c5682bb..d55e495faa11f5ecc3f63b5f07b0efc229f68911 100644 (file)
--- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
+++ b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
@@ -158,6 +158,7 @@ public sealed class ActionButton : Control
 
     protected override void OnThemeUpdated()
     {
+        base.OnThemeUpdated();
         Button.Texture = Theme.ResolveTexture("SlotBackground");
         Label.FontColorOverride = Theme.ResolveColorOrSpecified("whiteText");
     }

diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionPageButtons.xaml b/Content.Client/UserInterface/Systems/Actions/Controls/ActionPageButtons.xaml
index de805cc6bc96994c35905d3b5c412f86908ac389..b07380caae14c09cf2869415e9bdd45fe133bb56 100644 (file)
--- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionPageButtons.xaml
+++ b/Content.Client/UserInterface/Systems/Actions/Controls/ActionPageButtons.xaml
@@ -3,7 +3,7 @@
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Systems.Actions.Controls">
     <BoxContainer Orientation="Horizontal">
         <Control HorizontalExpand="True" SizeFlagsStretchRatio="1"/>
-        <TextureButton TexturePath="/Textures/Interface/Nano/left_arrow.svg.192dpi.png"
+        <TextureButton TexturePath="left_arrow.svg.192dpi"
                        SizeFlagsStretchRatio="1"
                        Scale="0.5 0.5"
                        HorizontalAlignment="Center"
@@ -13,7 +13,7 @@
         <Control HorizontalExpand="True" SizeFlagsStretchRatio="2"/>
         <Label Text="1" SizeFlagsStretchRatio="1" Name="Label" Access="Public" />
         <Control HorizontalExpand="True" SizeFlagsStretchRatio="2"/>
-        <TextureButton TexturePath="/Textures/Interface/Nano/right_arrow.svg.192dpi.png"
+        <TextureButton TexturePath="right_arrow.svg.192dpi"
                        SizeFlagsStretchRatio="1"
                        Scale="0.5 0.5"
                        HorizontalAlignment="Center"

diff --git a/Resources/Textures/Interface/Nano/left_arrow.svg b/Resources/Textures/Interface/Default/left_arrow.svg
similarity index 100%
rename from Resources/Textures/Interface/Nano/left_arrow.svg
rename to Resources/Textures/Interface/Default/left_arrow.svg

diff --git a/Resources/Textures/Interface/Nano/left_arrow.svg.192dpi.png b/Resources/Textures/Interface/Default/left_arrow.svg.192dpi.png
similarity index 100%
rename from Resources/Textures/Interface/Nano/left_arrow.svg.192dpi.png
rename to Resources/Textures/Interface/Default/left_arrow.svg.192dpi.png

diff --git a/Resources/Textures/Interface/Nano/left_arrow.svg.192dpi.png.yml b/Resources/Textures/Interface/Default/left_arrow.svg.192dpi.png.yml
similarity index 100%
rename from Resources/Textures/Interface/Nano/left_arrow.svg.192dpi.png.yml
rename to Resources/Textures/Interface/Default/left_arrow.svg.192dpi.png.yml

diff --git a/Resources/Textures/Interface/Nano/right_arrow.svg b/Resources/Textures/Interface/Default/right_arrow.svg
similarity index 100%
rename from Resources/Textures/Interface/Nano/right_arrow.svg
rename to Resources/Textures/Interface/Default/right_arrow.svg

diff --git a/Resources/Textures/Interface/Nano/right_arrow.svg.192dpi.png b/Resources/Textures/Interface/Default/right_arrow.svg.192dpi.png
similarity index 100%
rename from Resources/Textures/Interface/Nano/right_arrow.svg.192dpi.png
rename to Resources/Textures/Interface/Default/right_arrow.svg.192dpi.png

diff --git a/Resources/Textures/Interface/Nano/right_arrow.svg.192dpi.png.yml b/Resources/Textures/Interface/Default/right_arrow.svg.192dpi.png.yml
similarity index 100%
rename from Resources/Textures/Interface/Nano/right_arrow.svg.192dpi.png.yml
rename to Resources/Textures/Interface/Default/right_arrow.svg.192dpi.png.yml