diff --git a/Content.Client/Paper/UI/PaperSheetlet.cs b/Content.Client/Paper/UI/PaperSheetlet.cs index 2af29ded8e..3ff645ac1f 100644 --- a/Content.Client/Paper/UI/PaperSheetlet.cs +++ b/Content.Client/Paper/UI/PaperSheetlet.cs @@ -1,4 +1,4 @@ -using Content.Client.Resources; +using Content.Client.Resources; using Content.Client.Stylesheets; using Content.Client.Stylesheets.SheetletConfigs; using Content.Client.Stylesheets.Stylesheets; @@ -22,12 +22,22 @@ public sealed class PaperSheetlet : Sheetlet { Texture = sheet.GetTexture(windowCfg.TransparentWindowBackgroundBorderedPath) }; paperBox.SetPatchMargin(StyleBox.Margin.All, 2); + var borderedTransparentTex = ResCache.GetTexture("/Textures/Interface/Nano/transparent_window_background_bordered.png"); + var borderedTransparentBackground = new StyleBoxTexture + { + Texture = borderedTransparentTex, + }; + borderedTransparentBackground.SetPatchMargin(StyleBox.Margin.All, 2); + return [ E().Identifier("PaperContainer").Panel(paperBox), E() .Identifier("PaperDefaultBorder") .Prop(PanelContainer.StylePropertyPanel, paperBackground), + E() + .Identifier("PaperEditBackground") + .Prop(PanelContainer.StylePropertyPanel, borderedTransparentBackground), ]; } } diff --git a/Content.Client/Paper/UI/PaperWindow.xaml b/Content.Client/Paper/UI/PaperWindow.xaml index 8ec51e962d..e3d97abc9d 100644 --- a/Content.Client/Paper/UI/PaperWindow.xaml +++ b/Content.Client/Paper/UI/PaperWindow.xaml @@ -16,7 +16,7 @@ - diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs index 74aca61442..573b83cca4 100644 --- a/Content.Client/Stylesheets/StyleNano.cs +++ b/Content.Client/Stylesheets/StyleNano.cs @@ -50,7 +50,6 @@ namespace Content.Client.Stylesheets public const string StyleClassHandSlotHighlight = "HandSlotHighlight"; public const string StyleClassChatPanel = "ChatPanel"; public const string StyleClassChatSubPanel = "ChatSubPanel"; - public const string StyleClassTransparentBorderedWindowPanel = "TransparentBorderedWindowPanel"; public const string StyleClassHotbarPanel = "HotbarPanel"; public const string StyleClassTooltipPanel = "tooltipBox"; public const string StyleClassTooltipAlertTitle = "tooltipAlertTitle"; @@ -255,13 +254,6 @@ namespace Content.Client.Stylesheets }; handSlotHighlight.SetPatchMargin(StyleBox.Margin.All, 2); - var borderedTransparentWindowBackgroundTex = resCache.GetTexture("/Textures/Interface/Nano/transparent_window_background_bordered.png"); - var borderedTransparentWindowBackground = new StyleBoxTexture - { - Texture = borderedTransparentWindowBackgroundTex, - }; - borderedTransparentWindowBackground.SetPatchMargin(StyleBox.Margin.All, 2); - var hotbarBackground = new StyleBoxTexture { Texture = borderedWindowBackgroundTex, @@ -654,12 +646,6 @@ namespace Content.Client.Stylesheets { new StyleProperty(PanelContainer.StylePropertyPanel, borderedWindowBackground), }), - new StyleRule( - new SelectorElement(null, new[] {StyleClassTransparentBorderedWindowPanel}, null, null), - new[] - { - new StyleProperty(PanelContainer.StylePropertyPanel, borderedTransparentWindowBackground), - }), // inventory slot background new StyleRule( new SelectorElement(null, new[] {StyleClassInventorySlotBackground}, null, null),