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

Removing the redundant enum typecast apparently fixes the CS8600 warnings ¯\_(ツ)_/¯

Browse Source
This commit is contained in:
Acruid
2021-12-17 11:43:43 -08:00
parent 17ee658b7e
commit c093dfba7f
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Stylesheets/StyleBase.cs
View File

@@ -45,7 +45,7 @@ namespace Content.Client.Stylesheets
protected StyleBase(IResourceCache resCache) protected StyleBase(IResourceCache resCache)
{ {
FontLib = new FontLibrary( FontLib = new FontLibrary(
new FontClass(Id: "notosans", Style: (FontStyle) default, Size: (FontSize) 12) new FontClass(Id: "notosans", Style: default, Size: (FontSize) 12)
) as IFontLibrary; ) as IFontLibrary;
FontLib.AddFont("notosans", FontLib.AddFont("notosans",
@@ -182,7 +182,7 @@ namespace Content.Client.Stylesheets
new[] new[]
{ {
new StyleProperty("font-library", FontLib), new StyleProperty("font-library", FontLib),
new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 12)), new StyleProperty("font", new FontClass("notosans", default, (FontSize) 12)),
}), }),
// Default font. // Default font.

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

@@ -462,7 +462,7 @@ namespace Content.Client.Stylesheets
FontLib.AddFont("box", FontLib.AddFont("box",
new FontVariant new FontVariant
( (
(FontStyle) default, default,
new [] new []
{ {
resCache.GetResource<FontResource>("/Fonts/Boxfont-round/Boxfont Round.ttf") resCache.GetResource<FontResource>("/Fonts/Boxfont-round/Boxfont Round.ttf")
@@ -652,7 +652,7 @@ namespace Content.Client.Stylesheets
.Prop(Label.StylePropertyFont, new FontClass("notosans", FontStyle.Italic, (FontSize) 12)), .Prop(Label.StylePropertyFont, new FontClass("notosans", FontStyle.Italic, (FontSize) 12)),
Element<RichTextLabel>().Class(VerbMenuElement.StyleClassVerbOtherText) Element<RichTextLabel>().Class(VerbMenuElement.StyleClassVerbOtherText)
.Prop(Label.StylePropertyFont, new FontClass("notosans", (FontStyle) default, (FontSize) 12)), .Prop(Label.StylePropertyFont, new FontClass("notosans", default, (FontSize) 12)),
// Thin buttons (No padding nor vertical margin) // Thin buttons (No padding nor vertical margin)
Element<EntityContainerButton>().Class(StyleClassStorageButton) Element<EntityContainerButton>().Class(StyleClassStorageButton)
@@ -833,11 +833,11 @@ namespace Content.Client.Stylesheets
}), }),
new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipAlertDescription}, null, null), new[] new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipAlertDescription}, null, null), new[]
{ {
new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 16)) new StyleProperty("font", new FontClass("notosans", default, (FontSize) 16))
}), }),
new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipAlertCooldown}, null, null), new[] new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipAlertCooldown}, null, null), new[]
{ {
new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 16)) new StyleProperty("font", new FontClass("notosans", default, (FontSize) 16))
}), }),
// action tooltip // action tooltip
@@ -847,21 +847,21 @@ namespace Content.Client.Stylesheets
}), }),
new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipActionDescription}, null, null), new[] new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipActionDescription}, null, null), new[]
{ {
new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 15)) new StyleProperty("font", new FontClass("notosans", default, (FontSize) 15))
}), }),
new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipActionCooldown}, null, null), new[] new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipActionCooldown}, null, null), new[]
{ {
new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 15)) new StyleProperty("font", new FontClass("notosans", default, (FontSize) 15))
}), }),
new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipActionRequirements}, null, null), new[] new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipActionRequirements}, null, null), new[]
{ {
new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 15)) new StyleProperty("font", new FontClass("notosans", default, (FontSize) 15))
}), }),
// small number for the entity counter in the entity menu // small number for the entity counter in the entity menu
new StyleRule(new SelectorElement(typeof(Label), new[] {EntityMenuElement.StyleClassEntityMenuCountText}, null, null), new[] new StyleRule(new SelectorElement(typeof(Label), new[] {EntityMenuElement.StyleClassEntityMenuCountText}, null, null), new[]
{ {
new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 10)), new StyleProperty("font", new FontClass("notosans", default, (FontSize) 10)),
new StyleProperty(Label.StylePropertyAlignMode, Label.AlignMode.Right), new StyleProperty(Label.StylePropertyAlignMode, Label.AlignMode.Right),
}), }),
@@ -925,7 +925,7 @@ namespace Content.Client.Stylesheets
new StyleRule( new StyleRule(
new SelectorElement(typeof(Label), new[] {Placeholder.StyleClassPlaceholderText}, null, null), new[] new SelectorElement(typeof(Label), new[] {Placeholder.StyleClassPlaceholderText}, null, null), new[]
{ {
new StyleProperty(Label.StylePropertyFont, new FontClass("notosans", (FontStyle) default, (FontSize) 16)), new StyleProperty(Label.StylePropertyFont, new FontClass("notosans", default, (FontSize) 16)),
new StyleProperty(Label.StylePropertyFontColor, new Color(103, 103, 103, 128)), new StyleProperty(Label.StylePropertyFontColor, new Color(103, 103, 103, 128)),
}), }),
@@ -947,7 +947,7 @@ namespace Content.Client.Stylesheets
// Small Label // Small Label
new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassLabelSubText}, null, null), new[] new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassLabelSubText}, null, null), new[]
{ {
new StyleProperty(Label.StylePropertyFont, new FontClass("notosans", (FontStyle) default, (FontSize) 10)), new StyleProperty(Label.StylePropertyFont, new FontClass("notosans", default, (FontSize) 10)),
new StyleProperty(Label.StylePropertyFontColor, Color.DarkGray), new StyleProperty(Label.StylePropertyFontColor, Color.DarkGray),
}), }),
@@ -961,7 +961,7 @@ namespace Content.Client.Stylesheets
new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassLabelSecondaryColor}, null, null), new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassLabelSecondaryColor}, null, null),
new[] new[]
{ {
new StyleProperty(Label.StylePropertyFont, new FontClass("notosans", (FontStyle) default, (FontSize) 12)), new StyleProperty(Label.StylePropertyFont, new FontClass("notosans", default, (FontSize) 12)),
new StyleProperty(Label.StylePropertyFontColor, Color.DarkGray), new StyleProperty(Label.StylePropertyFontColor, Color.DarkGray),
}), }),
@@ -971,7 +971,7 @@ namespace Content.Client.Stylesheets
new SelectorElement(typeof(Label), null, null, null)), new SelectorElement(typeof(Label), null, null, null)),
new[] new[]
{ {
new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 16)) new StyleProperty("font", new FontClass("notosans", default, (FontSize) 16))
}), }),
// Popup messages // Popup messages
@@ -1119,13 +1119,13 @@ namespace Content.Client.Stylesheets
SelectorElement.Class(StyleClassLabelBig), SelectorElement.Class(StyleClassLabelBig),
new[] new[]
{ {
new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 16)), new StyleProperty("font", new FontClass("notosans", default, (FontSize) 16)),
}), }),
// StyleClassItemStatus // StyleClassItemStatus
new StyleRule(SelectorElement.Class(StyleClassItemStatus), new[] new StyleRule(SelectorElement.Class(StyleClassItemStatus), new[]
{ {
new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 10)), new StyleProperty("font", new FontClass("notosans", default, (FontSize) 10)),
}), }),
// Slider // Slider
@@ -1230,7 +1230,7 @@ namespace Content.Client.Stylesheets
}), }),
Element<Label>().Class("FancyWindowTitle") Element<Label>().Class("FancyWindowTitle")
.Prop("font", new FontClass("boxfont", (FontStyle) default, (FontSize) 13)) .Prop("font", new FontClass("boxfont", default, (FontSize) 13))
.Prop("font-color", NanoGold), .Prop("font-color", NanoGold),
Element<PanelContainer>().Class("WindowHeadingBackground") Element<PanelContainer>().Class("WindowHeadingBackground")