Set SpriteView sizes in various controls. (#15935)

diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
index 2914223be99f893ae0dab9c358cd6c441ca6d966..3e43e4543f99674f9ab5722cdf1af306b17ce631 100644 (file)
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
@@ -8,7 +8,7 @@
         <BoxContainer Orientation="Horizontal" Margin="0 0 0 2">
             <!-- Left column (view of entity) -->
             <PanelContainer Margin="2 0 6 0" StyleClasses="Inset" VerticalAlignment="Center" VerticalExpand="True">
-                <SpriteView Name="EntityView" OverrideDirection="South" Scale="2 2" />
+                <SpriteView Name="EntityView" OverrideDirection="South" Scale="2 2" SetSize="64 64"/>
             </PanelContainer>
             <!-- Center column (pressure, temperature, alarm state) -->
             <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="0 0 6 0">

diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs
index a33671c3dba1c060bfcc4b2f6653d22ae21e7b65..0109f90cc51ae9dfc00e7555b8551da9ce68f7b0 100644 (file)
--- a/Content.Client/Examine/ExamineSystem.cs
+++ b/Content.Client/Examine/ExamineSystem.cs
@@ -207,6 +207,7 @@ namespace Content.Client.Examine
                 hBox.AddChild(new SpriteView
                 {
                     Sprite = sprite, OverrideDirection = Direction.South,
+                    SetSize = (32, 32),
                     Margin = new Thickness(2, 0, 2, 0),
                 });
             }

diff --git a/Content.Client/RoundEnd/RoundEndSummaryWindow.cs b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
index b7c3d1b2eed0db5949f205b0e492fbfe1a6d0458..c6d989c0a8f47486e00d914691621e839ba57b73 100644 (file)
--- a/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
+++ b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
@@ -129,6 +129,7 @@ namespace Content.Client.RoundEnd
                         Sprite = sprite,
                         OverrideDirection = Direction.South,
                         VerticalAlignment = VAlignment.Center,
+                        SetSize = (32, 32),
                         VerticalExpand = true,
                     });
                 }

diff --git a/Content.Client/Storage/UI/StorageWindow.cs b/Content.Client/Storage/UI/StorageWindow.cs
index 11d5b64da343a997e6c4e5b2df11bc71ca2c15b8..eca118d76257d99fd264ecd2470e557204ba61bd 100644 (file)
--- a/Content.Client/Storage/UI/StorageWindow.cs
+++ b/Content.Client/Storage/UI/StorageWindow.cs
@@ -123,7 +123,7 @@ namespace Content.Client.Storage.UI
                         {
                             HorizontalAlignment = HAlignment.Left,
                             VerticalAlignment = VAlignment.Center,
-                            MinSize = new Vector2(32.0f, 32.0f),
+                            SetSize = new Vector2(32.0f, 32.0f),
                             OverrideDirection = Direction.South,
                             Sprite = sprite
                         },

diff --git a/Content.Client/UserInterface/Controls/SlotControl.cs b/Content.Client/UserInterface/Controls/SlotControl.cs
index 245a71ecbeabf3a5fc3676f1f4024ddf4dff3ba1..207e3b435700ddba5bcfe69e66a9dd2431227a89 100644 (file)
--- a/Content.Client/UserInterface/Controls/SlotControl.cs
+++ b/Content.Client/UserInterface/Controls/SlotControl.cs
@@ -132,12 +132,14 @@ namespace Content.Client.UserInterface.Controls
             AddChild(SpriteView = new SpriteView
             {
                 Scale = (2, 2),
+                SetSize = (DefaultButtonSize, DefaultButtonSize),
                 OverrideDirection = Direction.South
             });
 
             AddChild(HoverSpriteView = new SpriteView
             {
                 Scale = (2, 2),
+                SetSize = (DefaultButtonSize, DefaultButtonSize),
                 OverrideDirection = Direction.South
             });
 

diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
index 9f05ed4d9843ef9f05ab7f4911a78bf6ffa156e0..e032b19534dcf9552ca529524a031afe7c5682bb 100644 (file)
--- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
+++ b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
@@ -95,6 +95,7 @@ public sealed class ActionButton : Control
             HorizontalExpand = true,
             VerticalExpand = true,
             Scale = (2, 2),
+            SetSize = (64, 64),
             Visible = false,
             OverrideDirection = Direction.South,
         };

diff --git a/Content.Client/UserInterface/Systems/Character/Windows/CharacterWindow.xaml b/Content.Client/UserInterface/Systems/Character/Windows/CharacterWindow.xaml
index 82f3e7ff19f01d215b40aabfbc1f4c9202e53b39..1e55cad891d9e5524e4790b692e75f14563e5157 100644 (file)
--- a/Content.Client/UserInterface/Systems/Character/Windows/CharacterWindow.xaml
+++ b/Content.Client/UserInterface/Systems/Character/Windows/CharacterWindow.xaml
@@ -8,7 +8,7 @@
     <ScrollContainer>
         <BoxContainer Orientation="Vertical">
             <BoxContainer Orientation="Horizontal">
-                <SpriteView OverrideDirection="South" Scale="2 2" Name="SpriteView" Access="Public"/>
+                <SpriteView OverrideDirection="South" Scale="2 2" Name="SpriteView" Access="Public" SetSize="64 64"/>
                 <BoxContainer Orientation="Vertical" VerticalAlignment="Top">
                     <Label Name="NameLabel" Access="Public"/>
                     <Label Name="SubText" VerticalAlignment="Top" StyleClasses="LabelSubText" Access="Public"/>

diff --git a/Content.Client/Verbs/UI/VerbMenuElement.cs b/Content.Client/Verbs/UI/VerbMenuElement.cs
index 57c532a9ffb5ed99dc0ae862bfcec7411645c826..e5361a1ea6e74b1d6129fcca47cda56aee12e2cf 100644 (file)
--- a/Content.Client/Verbs/UI/VerbMenuElement.cs
+++ b/Content.Client/Verbs/UI/VerbMenuElement.cs
@@ -48,6 +48,7 @@ namespace Content.Client.Verbs.UI
                 var spriteView = new SpriteView()
                 {
                     OverrideDirection = Direction.South,
+                    SetSize = (ElementHeight, ElementHeight),
                     Sprite = entManager.GetComponentOrNull<SpriteComponent>(verb.IconEntity.Value)
                 };