tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix style on paper editing background (#41009)

Browse Source
This commit is contained in:
eoineoineoin
2025-10-21 23:21:32 +01:00
committed by GitHub
parent 672c837786
commit 18feb67ff5
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Client/Paper/UI/PaperSheetlet.cs
View File

@@ -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<NanotrasenStylesheet>
{ 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<PanelContainer>().Identifier("PaperContainer").Panel(paperBox),
E<PanelContainer>()
.Identifier("PaperDefaultBorder")
.Prop(PanelContainer.StylePropertyPanel, paperBackground),
E<PanelContainer>()
.Identifier("PaperEditBackground")
.Prop(PanelContainer.StylePropertyPanel, borderedTransparentBackground),
];
}
}

2
Content.Client/Paper/UI/PaperWindow.xaml
View File

@@ -16,7 +16,7 @@
<RichTextLabel Name="BlankPaperIndicator" StyleClasses="LabelWeak" VerticalAlignment="Top" HorizontalAlignment="Center"/>
<RichTextLabel StyleClasses="PaperWrittenText" Name="WrittenTextLabel" VerticalAlignment="Top"/>
<BoxContainer Name="InputContainer" StyleIdentifier="PaperContainer" Orientation="Vertical" VerticalExpand="True" VerticalAlignment="Stretch">
<PanelContainer StyleClasses="TransparentBorderedWindowPanel" MinHeight="100"
<PanelContainer StyleIdentifier="PaperEditBackground" MinHeight="100"
VerticalAlignment="Stretch" VerticalExpand="True" HorizontalExpand="True">
<TextEdit Name="Input" StyleClasses="PaperLineEdit" Access="Public" />
</PanelContainer>

14
Content.Client/Stylesheets/StyleNano.cs
View File

@@ -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),