Upstream sync

.vscode/launch.json

@@ -13,6 +13,15 @@
             "console": "internalConsole",
             "stopAtEntry": false
         },
+        {
+            "name": "Client (Compatibility renderer)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll",
+            "args": "--cvar display.compat=true",
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
         {
             "name": "Server",
             "type": "coreclr",

Content.Client/Items/Systems/ItemToggleSystem.cs

@@ -0,0 +1,9 @@
+using Content.Shared.Item.ItemToggle;
+
+namespace Content.Shared.Item;
+
+/// <inheritdoc/>
+public sealed class ItemToggleSystem : SharedItemToggleSystem
+{
+
+}

Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml

@@ -2,15 +2,15 @@
                xmlns:ui="clr-namespace:Content.Client.Medical.CrewMonitoring"
                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                Title="{Loc 'crew-monitoring-user-interface-title'}"
-               SetSize="1200 700"
-               MinSize="1200 700">
+               SetSize="1210 700"
+               MinSize="1210 700">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal" VerticalExpand="True" HorizontalExpand="True">
             <ui:CrewMonitoringNavMapControl Name="NavMap" HorizontalExpand="True" VerticalExpand="True" Margin="5 20"/>
-            <BoxContainer Orientation="Vertical">
+            <BoxContainer Orientation="Vertical" Margin="0 0 10 0">
                 <controls:StripeBack>
                     <PanelContainer>
-                        <Label Name="StationName" Text="Unknown station" Align="Center" />
+                        <Label Name="StationName" Text="Unknown station" Align="Center" Margin="0 5 0 3"/>
                     </PanelContainer>
                 </controls:StripeBack>
 

Content.Client/Options/UI/Tabs/GraphicsTab.xaml

@@ -15,11 +15,6 @@
                 <Control MinSize="4 0" />
                 <OptionButton Name="UIScaleOption" />
             </BoxContainer>
-            <BoxContainer Orientation="Horizontal">
-                <Label Text="{Loc 'ui-options-hud-theme'}" />
-                <Control MinSize="4 0" />
-                <OptionButton Name="HudThemeOption" />
-            </BoxContainer>
             <BoxContainer Orientation="Horizontal">
                 <CheckBox Name="ViewportStretchCheckBox" Text="{Loc 'ui-options-vp-stretch'}" />
                 <BoxContainer Name="ViewportScaleBox" Orientation="Horizontal">
@@ -38,11 +33,6 @@
                         Rounded="True"
                         MinWidth="200" />
             </BoxContainer>
-            <BoxContainer Orientation="Horizontal">
-                <Label Text="{Loc 'ui-options-hud-layout'}" />
-                <Control MinSize="4 0" />
-                <OptionButton Name="HudLayoutOption" />
-            </BoxContainer>
             <CheckBox Name="IntegerScalingCheckBox"
                       Text="{Loc 'ui-options-vp-integer-scaling'}"
                       ToolTip="{Loc 'ui-options-vp-integer-scaling-tooltip'}" />

Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs

@@ -1,14 +1,11 @@
-using Content.Client.UserInterface.Screens;
 using Content.Shared.CCVar;
-using Content.Shared.HUD;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared;
 using Robust.Shared.Configuration;
-using Robust.Shared.Prototypes;
 
 namespace Content.Client.Options.UI.Tabs
 {
@@ -26,10 +23,7 @@ public sealed partial class GraphicsTab : Control
             2f
         };
 
-        private Dictionary<string, int> hudThemeIdToIndex = new();
-
         [Dependency] private readonly IConfigurationManager _cfg = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         public GraphicsTab()
         {
@@ -55,34 +49,6 @@ public GraphicsTab()
             UIScaleOption.AddItem(Loc.GetString("ui-options-scale-200"));
             UIScaleOption.OnItemSelected += OnUIScaleChanged;
 
-            foreach (var gear in _prototypeManager.EnumeratePrototypes<HudThemePrototype>())
-            {
-                HudThemeOption.AddItem(Loc.GetString(gear.Name));
-                hudThemeIdToIndex.Add(gear.ID, HudThemeOption.GetItemId(HudThemeOption.ItemCount - 1));
-            }
-            HudThemeOption.OnItemSelected += OnHudThemeChanged;
-
-            var hudLayout = _cfg.GetCVar(CCVars.UILayout);
-            var id = 0;
-            foreach (var layout in Enum.GetValues(typeof(ScreenType)))
-            {
-                var name = layout.ToString()!;
-                HudLayoutOption.AddItem(name, id);
-                if (name == hudLayout)
-                {
-                    HudLayoutOption.SelectId(id);
-                }
-                HudLayoutOption.SetItemMetadata(id, name);
-
-                id++;
-            }
-
-            HudLayoutOption.OnItemSelected += args =>
-            {
-                HudLayoutOption.SelectId(args.Id);
-                UpdateApplyButton();
-            };
-
             ViewportStretchCheckBox.OnToggled += _ =>
             {
                 UpdateViewportScale();
@@ -110,7 +76,6 @@ public GraphicsTab()
             FullscreenCheckBox.Pressed = ConfigIsFullscreen;
             LightingPresetOption.SelectId(GetConfigLightingQuality());
             UIScaleOption.SelectId(GetConfigUIScalePreset(ConfigUIScale));
-            HudThemeOption.SelectId(hudThemeIdToIndex.GetValueOrDefault(_cfg.GetCVar(CVars.InterfaceTheme), 0));
             ViewportScaleSlider.Value = _cfg.GetCVar(CCVars.ViewportFixedScaleFactor);
             ViewportStretchCheckBox.Pressed = _cfg.GetCVar(CCVars.ViewportStretch);
             IntegerScalingCheckBox.Pressed = _cfg.GetCVar(CCVars.ViewportSnapToleranceMargin) != 0;
@@ -134,25 +99,11 @@ private void OnUIScaleChanged(OptionButton.ItemSelectedEventArgs args)
             UpdateApplyButton();
         }
 
-        private void OnHudThemeChanged(OptionButton.ItemSelectedEventArgs args)
-        {
-            HudThemeOption.SelectId(args.Id);
-            UpdateApplyButton();
-        }
-
         private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
         {
             _cfg.SetCVar(CVars.DisplayVSync, VSyncCheckBox.Pressed);
             SetConfigLightingQuality(LightingPresetOption.SelectedId);
 
-            foreach (var theme in _prototypeManager.EnumeratePrototypes<HudThemePrototype>())
-            {
-                if (hudThemeIdToIndex[theme.ID] != HudThemeOption.SelectedId)
-                    continue;
-                _cfg.SetCVar(CVars.InterfaceTheme, theme.ID);
-                break;
-            }
-
             _cfg.SetCVar(CVars.DisplayWindowMode,
                          (int) (FullscreenCheckBox.Pressed ? WindowMode.Fullscreen : WindowMode.Windowed));
             _cfg.SetCVar(CVars.DisplayUIScale, UIScaleOptions[UIScaleOption.SelectedId]);
@@ -165,11 +116,6 @@ private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
             _cfg.SetCVar(CCVars.HudFpsCounterVisible, FpsCounterCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ViewportWidth, (int) ViewportWidthSlider.Value);
 
-            if (HudLayoutOption.SelectedMetadata is string opt)
-            {
-                _cfg.SetCVar(CCVars.UILayout, opt);
-            }
-
             _cfg.SaveToFile();
             UpdateApplyButton();
         }
@@ -190,7 +136,6 @@ private void UpdateApplyButton()
             var isVSyncSame = VSyncCheckBox.Pressed == _cfg.GetCVar(CVars.DisplayVSync);
             var isFullscreenSame = FullscreenCheckBox.Pressed == ConfigIsFullscreen;
             var isLightingQualitySame = LightingPresetOption.SelectedId == GetConfigLightingQuality();
-            var isHudThemeSame = HudThemeOption.SelectedId == hudThemeIdToIndex.GetValueOrDefault(_cfg.GetCVar(CVars.InterfaceTheme), 0);
             var isUIScaleSame = MathHelper.CloseToPercent(UIScaleOptions[UIScaleOption.SelectedId], ConfigUIScale);
             var isVPStretchSame = ViewportStretchCheckBox.Pressed == _cfg.GetCVar(CCVars.ViewportStretch);
             var isVPScaleSame = (int) ViewportScaleSlider.Value == _cfg.GetCVar(CCVars.ViewportFixedScaleFactor);
@@ -199,7 +144,6 @@ private void UpdateApplyButton()
             var isPLQSame = ParallaxLowQualityCheckBox.Pressed == _cfg.GetCVar(CCVars.ParallaxLowQuality);
             var isFpsCounterVisibleSame = FpsCounterCheckBox.Pressed == _cfg.GetCVar(CCVars.HudFpsCounterVisible);
             var isWidthSame = (int) ViewportWidthSlider.Value == _cfg.GetCVar(CCVars.ViewportWidth);
-            var isLayoutSame = HudLayoutOption.SelectedMetadata is string opt && opt == _cfg.GetCVar(CCVars.UILayout);
 
             ApplyButton.Disabled = isVSyncSame &&
                                    isFullscreenSame &&
@@ -210,10 +154,8 @@ private void UpdateApplyButton()
                                    isIntegerScalingSame &&
                                    isVPResSame &&
                                    isPLQSame &&
-                                   isHudThemeSame &&
                                    isFpsCounterVisibleSame &&
-                                   isWidthSame &&
-                                   isLayoutSame;
+                                   isWidthSame;
         }
 
         private bool ConfigIsFullscreen =>

Content.Client/Options/UI/Tabs/MiscTab.xaml

@@ -5,6 +5,19 @@
                   xmlns:s="clr-namespace:Content.Client.Stylesheets">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Vertical" Margin="8 8 8 8" VerticalExpand="True">
+            <Label Text="{Loc 'ui-options-general-ui-style'}"
+                   FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
+                   StyleClasses="LabelKeyText"/>
+            <BoxContainer Orientation="Horizontal">
+                <Label Text="{Loc 'ui-options-hud-theme'}" />
+                <Control MinSize="4 0" />
+                <OptionButton Name="HudThemeOption" />
+            </BoxContainer>
+            <BoxContainer Orientation="Horizontal">
+                <Label Text="{Loc 'ui-options-hud-layout'}" />
+                <Control MinSize="4 0" />
+                <OptionButton Name="HudLayoutOption" />
+            </BoxContainer>
             <Label Text="{Loc 'ui-options-general-discord'}"
                    FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
                    StyleClasses="LabelKeyText"/>

Content.Client/Options/UI/Tabs/MiscTab.xaml.cs

@@ -1,25 +1,60 @@
-using Content.Shared.CCVar;
+using System.Linq;
+using Content.Client.UserInterface.Screens;
+using Content.Shared.CCVar;
+using Content.Shared.HUD;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared;
 using Robust.Shared.Configuration;
-using Robust.Shared.Input;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Options.UI.Tabs
 {
     [GenerateTypedNameReferences]
     public sealed partial class MiscTab : Control
     {
-
         [Dependency] private readonly IConfigurationManager _cfg = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+        private readonly Dictionary<string, int> _hudThemeIdToIndex = new();
 
         public MiscTab()
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
 
+            var themes = _prototypeManager.EnumeratePrototypes<HudThemePrototype>().ToList();
+            themes.Sort();
+            foreach (var gear in themes)
+            {
+                HudThemeOption.AddItem(Loc.GetString(gear.Name));
+                _hudThemeIdToIndex.Add(gear.ID, HudThemeOption.GetItemId(HudThemeOption.ItemCount - 1));
+            }
+
+            var hudLayout = _cfg.GetCVar(CCVars.UILayout);
+            var id = 0;
+            foreach (var layout in Enum.GetValues(typeof(ScreenType)))
+            {
+                var name = layout.ToString()!;
+                HudLayoutOption.AddItem(name, id);
+                if (name == hudLayout)
+                {
+                    HudLayoutOption.SelectId(id);
+                }
+                HudLayoutOption.SetItemMetadata(id, name);
+
+                id++;
+            }
+
+            HudLayoutOption.OnItemSelected += args =>
+            {
+                HudLayoutOption.SelectId(args.Id);
+                UpdateApplyButton();
+            };
+
+            HudThemeOption.OnItemSelected += OnHudThemeChanged;
             DiscordRich.OnToggled += OnCheckBoxToggled;
             ShowLoocAboveHeadCheckBox.OnToggled += OnCheckBoxToggled;
             ShowHeldItemCheckBox.OnToggled += OnCheckBoxToggled;
@@ -30,6 +65,7 @@ public MiscTab()
             // ToggleWalk.OnToggled += OnCheckBoxToggled;
             StaticStorageUI.OnToggled += OnCheckBoxToggled;
 
+            HudThemeOption.SelectId(_hudThemeIdToIndex.GetValueOrDefault(_cfg.GetCVar(CVars.InterfaceTheme), 0));
             DiscordRich.Pressed = _cfg.GetCVar(CVars.DiscordEnabled);
             ShowLoocAboveHeadCheckBox.Pressed = _cfg.GetCVar(CCVars.LoocAboveHeadShow);
             ShowHeldItemCheckBox.Pressed = _cfg.GetCVar(CCVars.HudHeldItemShow);
@@ -50,8 +86,22 @@ private void OnCheckBoxToggled(BaseButton.ButtonToggledEventArgs args)
             UpdateApplyButton();
         }
 
+        private void OnHudThemeChanged(OptionButton.ItemSelectedEventArgs args)
+        {
+            HudThemeOption.SelectId(args.Id);
+            UpdateApplyButton();
+        }
+
         private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
         {
+            foreach (var theme in _prototypeManager.EnumeratePrototypes<HudThemePrototype>())
+            {
+                if (_hudThemeIdToIndex[theme.ID] != HudThemeOption.SelectedId)
+                    continue;
+                _cfg.SetCVar(CVars.InterfaceTheme, theme.ID);
+                break;
+            }
+
             _cfg.SetCVar(CVars.DiscordEnabled, DiscordRich.Pressed);
             _cfg.SetCVar(CCVars.HudHeldItemShow, ShowHeldItemCheckBox.Pressed);
             _cfg.SetCVar(CCVars.CombatModeIndicatorsPointShow, ShowCombatModeIndicatorsCheckBox.Pressed);
@@ -62,12 +112,19 @@ private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
             // _cfg.SetCVar(CCVars.ToggleWalk, ToggleWalk.Pressed);
             _cfg.SetCVar(CCVars.StaticStorageUI, StaticStorageUI.Pressed);
 
+            if (HudLayoutOption.SelectedMetadata is string opt)
+            {
+                _cfg.SetCVar(CCVars.UILayout, opt);
+            }
+
             _cfg.SaveToFile();
             UpdateApplyButton();
         }
 
         private void UpdateApplyButton()
         {
+            var isHudThemeSame = HudThemeOption.SelectedId == _hudThemeIdToIndex.GetValueOrDefault(_cfg.GetCVar(CVars.InterfaceTheme), 0);
+            var isLayoutSame = HudLayoutOption.SelectedMetadata is string opt && opt == _cfg.GetCVar(CCVars.UILayout);
             var isDiscordSame = DiscordRich.Pressed == _cfg.GetCVar(CVars.DiscordEnabled);
             var isShowHeldItemSame = ShowHeldItemCheckBox.Pressed == _cfg.GetCVar(CCVars.HudHeldItemShow);
             var isCombatModeIndicatorsSame = ShowCombatModeIndicatorsCheckBox.Pressed == _cfg.GetCVar(CCVars.CombatModeIndicatorsPointShow);
@@ -78,7 +135,9 @@ private void UpdateApplyButton()
             // var isToggleWalkSame = ToggleWalk.Pressed == _cfg.GetCVar(CCVars.ToggleWalk);
             var isStaticStorageUISame = StaticStorageUI.Pressed == _cfg.GetCVar(CCVars.StaticStorageUI);
 
-            ApplyButton.Disabled = isDiscordSame &&
+            ApplyButton.Disabled = isHudThemeSame &&
+                                   isLayoutSame &&
+                                   isDiscordSame &&
                                    isShowHeldItemSame &&
                                    isCombatModeIndicatorsSame &&
                                    isOpaqueStorageWindow &&

Content.Client/Paper/UI/PaperBoundUserInterface.cs

@@ -1,5 +1,4 @@
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Input;
 using Robust.Shared.Utility;
@@ -49,15 +48,12 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
     private void Input_OnTextEntered(string text)
     {
-        if (!string.IsNullOrEmpty(text))
-        {
-            SendMessage(new PaperInputTextMessage(text));
+        SendMessage(new PaperInputTextMessage(text));
 
-            if (_window != null)
-            {
-                _window.Input.TextRope = Rope.Leaf.Empty;
-                _window.Input.CursorPosition = new TextEdit.CursorPos(0, TextEdit.LineBreakBias.Top);
-            }
+        if (_window != null)
+        {
+            _window.Input.TextRope = Rope.Leaf.Empty;
+            _window.Input.CursorPosition = new TextEdit.CursorPos(0, TextEdit.LineBreakBias.Top);
         }
     }