From 08d6a4298390e5b55581a51bc37fc41e38de1137 Mon Sep 17 00:00:00 2001 From: eoineoineoin Date: Sat, 8 Jul 2023 19:57:47 +0100 Subject: [PATCH] Minor visual fixups from StyleboxTexture scaling (#17763) --- Content.Client/Paper/UI/PaperWindow.xaml.cs | 2 +- Content.Client/UserInterface/Controls/StripeBack.cs | 2 +- Resources/Textures/Interface/Nano/button.svg.96dpi.png.yml | 2 ++ .../Interface/Nano/geometric_panel_border.svg.96dpi.png.yml | 2 ++ Resources/Textures/Interface/Nano/stripeback.svg.96dpi.png.yml | 2 ++ .../Interface/Paper/paper_background_book.svg.96dpi.png.yml | 2 ++ .../Interface/Paper/paper_background_default.svg.96dpi.png.yml | 2 ++ .../Paper/paper_background_dotmatrix.svg.96dpi.png.yml | 2 ++ .../Paper/paper_background_perforated.svg.96dpi.png.yml | 2 ++ .../Interface/Paper/paper_content_dotmatrix.svg.96dpi.png.yml | 2 ++ .../Interface/Paper/paper_content_lined.svg.96dpi.png.yml | 2 ++ .../Paper/paper_heading_artifact_analyzer.svg.96dpi.png.yml | 2 ++ .../Paper/paper_heading_captains_thoughts.svg.96dpi.png.yml | 2 ++ .../Paper/paper_heading_cargo_invoice.svg.96dpi.png.yml | 2 ++ .../Paper/paper_heading_forensic_scanner.svg.96dpi.png.yml | 2 ++ .../Interface/Paper/paper_heading_virus.svg.96dpi.png.yml | 2 ++ 16 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Interface/Nano/button.svg.96dpi.png.yml create mode 100644 Resources/Textures/Interface/Nano/geometric_panel_border.svg.96dpi.png.yml create mode 100644 Resources/Textures/Interface/Nano/stripeback.svg.96dpi.png.yml create mode 100644 Resources/Textures/Interface/Paper/paper_background_book.svg.96dpi.png.yml create mode 100644 Resources/Textures/Interface/Paper/paper_background_default.svg.96dpi.png.yml create mode 100644 Resources/Textures/Interface/Paper/paper_background_dotmatrix.svg.96dpi.png.yml create mode 100644 Resources/Textures/Interface/Paper/paper_background_perforated.svg.96dpi.png.yml create mode 100644 Resources/Textures/Interface/Paper/paper_content_dotmatrix.svg.96dpi.png.yml create mode 100644 Resources/Textures/Interface/Paper/paper_content_lined.svg.96dpi.png.yml create mode 100644 Resources/Textures/Interface/Paper/paper_heading_artifact_analyzer.svg.96dpi.png.yml create mode 100644 Resources/Textures/Interface/Paper/paper_heading_captains_thoughts.svg.96dpi.png.yml create mode 100644 Resources/Textures/Interface/Paper/paper_heading_cargo_invoice.svg.96dpi.png.yml create mode 100644 Resources/Textures/Interface/Paper/paper_heading_forensic_scanner.svg.96dpi.png.yml create mode 100644 Resources/Textures/Interface/Paper/paper_heading_virus.svg.96dpi.png.yml diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs index 5c20dd0292..3fee623bca 100644 --- a/Content.Client/Paper/UI/PaperWindow.xaml.cs +++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs @@ -148,7 +148,7 @@ namespace Content.Client.Paper.UI // so we need to get some info out now: if (WrittenTextLabel.TryGetStyleProperty("font", out var font)) { - float fontLineHeight = font.GetLineHeight(UIScale); + float fontLineHeight = font.GetLineHeight(1.0f); // This positions the texture so the font baseline is on the bottom: _paperContentTex.ExpandMarginTop = font.GetDescent(UIScale); // And this scales the texture so that it's a single text line: diff --git a/Content.Client/UserInterface/Controls/StripeBack.cs b/Content.Client/UserInterface/Controls/StripeBack.cs index 3e7f017db1..169f2d85a8 100644 --- a/Content.Client/UserInterface/Controls/StripeBack.cs +++ b/Content.Client/UserInterface/Controls/StripeBack.cs @@ -113,7 +113,7 @@ namespace Content.Client.UserInterface.Controls EdgeColor); } - GetActualStyleBox()?.Draw(handle, centerBox); + GetActualStyleBox()?.Draw(handle, centerBox, UIScale); } private StyleBox? GetActualStyleBox() diff --git a/Resources/Textures/Interface/Nano/button.svg.96dpi.png.yml b/Resources/Textures/Interface/Nano/button.svg.96dpi.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/Interface/Nano/button.svg.96dpi.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Interface/Nano/geometric_panel_border.svg.96dpi.png.yml b/Resources/Textures/Interface/Nano/geometric_panel_border.svg.96dpi.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/Interface/Nano/geometric_panel_border.svg.96dpi.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Interface/Nano/stripeback.svg.96dpi.png.yml b/Resources/Textures/Interface/Nano/stripeback.svg.96dpi.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/Interface/Nano/stripeback.svg.96dpi.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Interface/Paper/paper_background_book.svg.96dpi.png.yml b/Resources/Textures/Interface/Paper/paper_background_book.svg.96dpi.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/Interface/Paper/paper_background_book.svg.96dpi.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Interface/Paper/paper_background_default.svg.96dpi.png.yml b/Resources/Textures/Interface/Paper/paper_background_default.svg.96dpi.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/Interface/Paper/paper_background_default.svg.96dpi.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Interface/Paper/paper_background_dotmatrix.svg.96dpi.png.yml b/Resources/Textures/Interface/Paper/paper_background_dotmatrix.svg.96dpi.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/Interface/Paper/paper_background_dotmatrix.svg.96dpi.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Interface/Paper/paper_background_perforated.svg.96dpi.png.yml b/Resources/Textures/Interface/Paper/paper_background_perforated.svg.96dpi.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/Interface/Paper/paper_background_perforated.svg.96dpi.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Interface/Paper/paper_content_dotmatrix.svg.96dpi.png.yml b/Resources/Textures/Interface/Paper/paper_content_dotmatrix.svg.96dpi.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/Interface/Paper/paper_content_dotmatrix.svg.96dpi.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Interface/Paper/paper_content_lined.svg.96dpi.png.yml b/Resources/Textures/Interface/Paper/paper_content_lined.svg.96dpi.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/Interface/Paper/paper_content_lined.svg.96dpi.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Interface/Paper/paper_heading_artifact_analyzer.svg.96dpi.png.yml b/Resources/Textures/Interface/Paper/paper_heading_artifact_analyzer.svg.96dpi.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/Interface/Paper/paper_heading_artifact_analyzer.svg.96dpi.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Interface/Paper/paper_heading_captains_thoughts.svg.96dpi.png.yml b/Resources/Textures/Interface/Paper/paper_heading_captains_thoughts.svg.96dpi.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/Interface/Paper/paper_heading_captains_thoughts.svg.96dpi.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Interface/Paper/paper_heading_cargo_invoice.svg.96dpi.png.yml b/Resources/Textures/Interface/Paper/paper_heading_cargo_invoice.svg.96dpi.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/Interface/Paper/paper_heading_cargo_invoice.svg.96dpi.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Interface/Paper/paper_heading_forensic_scanner.svg.96dpi.png.yml b/Resources/Textures/Interface/Paper/paper_heading_forensic_scanner.svg.96dpi.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/Interface/Paper/paper_heading_forensic_scanner.svg.96dpi.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Interface/Paper/paper_heading_virus.svg.96dpi.png.yml b/Resources/Textures/Interface/Paper/paper_heading_virus.svg.96dpi.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/Interface/Paper/paper_heading_virus.svg.96dpi.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true