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

Change theming now that the font system isn't unstable.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2019-02-24 16:14:36 +01:00
parent 7664fcf1f4
commit 5436d6831e
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Content.Client/UserInterface/NanoStyle.cs
View File

@@ -1,7 +1,6 @@
using SS14.Client.Graphics; using Content.Client.Utility;
using SS14.Client.Graphics.Drawing; using SS14.Client.Graphics.Drawing;
using SS14.Client.Interfaces.ResourceManagement; using SS14.Client.Interfaces.ResourceManagement;
using SS14.Client.ResourceManagement;
using SS14.Client.UserInterface; using SS14.Client.UserInterface;
using SS14.Client.UserInterface.Controls; using SS14.Client.UserInterface.Controls;
using SS14.Client.UserInterface.CustomControls; using SS14.Client.UserInterface.CustomControls;
@@ -19,21 +18,18 @@ namespace Content.Client.UserInterface
public NanoStyle() public NanoStyle()
{ {
var resCache = IoCManager.Resolve<IResourceCache>(); var resCache = IoCManager.Resolve<IResourceCache>();
var notoSans12 = new VectorFont(resCache.GetResource<FontResource>("/Nano/NotoSans/NotoSans-Regular.ttf"), var notoSans12 = resCache.GetFont("/Nano/NotoSans/NotoSans-Regular.ttf", 12);
12); var notoSansBold16 = resCache.GetFont("/Nano/NotoSans/NotoSans-Bold.ttf", 16);
var notoSans28 = new VectorFont(resCache.GetResource<FontResource>("/Nano/NotoSans/NotoSans-Regular.ttf"), var animalSilence40 = resCache.GetFont("/Fonts/Animal Silence.otf", 40);
28); var textureCloseButton = resCache.GetTexture("/Nano/cross.svg.png");
var notoSansBold16 = var windowHeaderTex = resCache.GetTexture("/Nano/window_header.png");
new VectorFont(resCache.GetResource<FontResource>("/Nano/NotoSans/NotoSans-Bold.ttf"), 16);
var textureCloseButton = resCache.GetResource<TextureResource>("/Nano/cross.svg.png").Texture;
var windowHeaderTex = resCache.GetResource<TextureResource>("/Nano/window_header.png").Texture;
var windowHeader = new StyleBoxTexture var windowHeader = new StyleBoxTexture
{ {
Texture = windowHeaderTex, Texture = windowHeaderTex,
PatchMarginBottom = 3, PatchMarginBottom = 3,
ExpandMarginBottom = 3, ExpandMarginBottom = 3,
}; };
var windowBackgroundTex = resCache.GetResource<TextureResource>("/Nano/window_background.png").Texture; var windowBackgroundTex = resCache.GetTexture("/Nano/window_background.png");
var windowBackground = new StyleBoxTexture var windowBackground = new StyleBoxTexture
{ {
Texture = windowBackgroundTex, Texture = windowBackgroundTex,
@@ -41,7 +37,7 @@ namespace Content.Client.UserInterface
windowBackground.SetPatchMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2); windowBackground.SetPatchMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2);
windowBackground.SetExpandMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2); windowBackground.SetExpandMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2);
var buttonNormalTex = resCache.GetResource<TextureResource>("/Nano/button_normal.png").Texture; var buttonNormalTex = resCache.GetTexture("/Nano/button_normal.png");
var buttonNormal = new StyleBoxTexture var buttonNormal = new StyleBoxTexture
{ {
Texture = buttonNormalTex, Texture = buttonNormalTex,
@@ -49,7 +45,7 @@ namespace Content.Client.UserInterface
buttonNormal.SetPatchMargin(StyleBox.Margin.All, 2); buttonNormal.SetPatchMargin(StyleBox.Margin.All, 2);
buttonNormal.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4); buttonNormal.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4);
var buttonHoverTex = resCache.GetResource<TextureResource>("/Nano/button_hover.png").Texture; var buttonHoverTex = resCache.GetTexture("/Nano/button_hover.png");
var buttonHover = new StyleBoxTexture var buttonHover = new StyleBoxTexture
{ {
Texture = buttonHoverTex, Texture = buttonHoverTex,
@@ -57,7 +53,7 @@ namespace Content.Client.UserInterface
buttonHover.SetPatchMargin(StyleBox.Margin.All, 2); buttonHover.SetPatchMargin(StyleBox.Margin.All, 2);
buttonHover.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4); buttonHover.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4);
var buttonPressedTex = resCache.GetResource<TextureResource>("/Nano/button_pressed.png").Texture; var buttonPressedTex = resCache.GetTexture("/Nano/button_pressed.png");
var buttonPressed = new StyleBoxTexture var buttonPressed = new StyleBoxTexture
{ {
Texture = buttonPressedTex, Texture = buttonPressedTex,
@@ -65,7 +61,7 @@ namespace Content.Client.UserInterface
buttonPressed.SetPatchMargin(StyleBox.Margin.All, 2); buttonPressed.SetPatchMargin(StyleBox.Margin.All, 2);
buttonPressed.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4); buttonPressed.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4);
var buttonDisabledTex = resCache.GetResource<TextureResource>("/Nano/button_disabled.png").Texture; var buttonDisabledTex = resCache.GetTexture("/Nano/button_disabled.png");
var buttonDisabled = new StyleBoxTexture var buttonDisabled = new StyleBoxTexture
{ {
Texture = buttonDisabledTex, Texture = buttonDisabledTex,
@@ -73,7 +69,7 @@ namespace Content.Client.UserInterface
buttonDisabled.SetPatchMargin(StyleBox.Margin.All, 2); buttonDisabled.SetPatchMargin(StyleBox.Margin.All, 2);
buttonDisabled.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4); buttonDisabled.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4);
var lineEditTex = resCache.GetResource<TextureResource>("/Nano/lineedit.png").Texture; var lineEditTex = resCache.GetTexture("/Nano/lineedit.png");
var lineEdit = new StyleBoxTexture var lineEdit = new StyleBoxTexture
{ {
Texture = lineEditTex, Texture = lineEditTex,
@@ -173,7 +169,7 @@ namespace Content.Client.UserInterface
new SelectorElement(typeof(Button), null, null, null)), new SelectorElement(typeof(Button), null, null, null)),
new[] new[]
{ {
new StyleProperty("font", notoSans28), new StyleProperty("font", animalSilence40),
}), }),
// Main menu: also make those buttons slightly more separated. // Main menu: also make those buttons slightly more separated.