Character editor style fixes (#41278)
* Restore pre-StyleNano element height * Add style for HelpButton to sheetlet --------- Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
This commit is contained in:
parent
64d3b0638f
commit
8ae4611855
|
|
@ -28,8 +28,7 @@
|
|||
Text="{Loc 'character-setup-gui-character-setup-close-button'}"
|
||||
StyleClasses="ButtonBig"/>
|
||||
</BoxContainer>
|
||||
<PanelContainer StyleClasses="highlight">
|
||||
</PanelContainer>
|
||||
<PanelContainer StyleClasses="highlight" MinHeight="2" />
|
||||
<BoxContainer Orientation="Horizontal" VerticalExpand="True" SeparationOverride="0">
|
||||
<ScrollContainer MinSize="325 0" Margin="5 5 0 0">
|
||||
<BoxContainer Name="Characters" Orientation="Vertical" />
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ public sealed class ButtonSheetlet<T> : Sheetlet<T> where T : PalettedStylesheet
|
|||
|
||||
var crossTex = sheet.GetTextureOr(iconCfg.CrossIconPath, NanotrasenStylesheet.TextureRoot);
|
||||
var refreshTex = sheet.GetTextureOr(iconCfg.RefreshIconPath, NanotrasenStylesheet.TextureRoot);
|
||||
var helpTex = sheet.GetTextureOr(iconCfg.HelpIconPath, NanotrasenStylesheet.TextureRoot);
|
||||
|
||||
var rules = new List<StyleRule>
|
||||
{
|
||||
|
|
@ -56,6 +57,11 @@ public sealed class ButtonSheetlet<T> : Sheetlet<T> where T : PalettedStylesheet
|
|||
.Class(StyleClass.RefreshButton)
|
||||
.Prop(TextureButton.StylePropertyTexture, refreshTex),
|
||||
|
||||
// Help button
|
||||
E<TextureButton>()
|
||||
.Class(StyleClass.HelpButton)
|
||||
.Prop(TextureButton.StylePropertyTexture, helpTex),
|
||||
|
||||
// Ensure labels in buttons are aligned.
|
||||
E<Label>()
|
||||
// ReSharper disable once AccessToStaticMemberViaDerivedType
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ public static class StyleClass
|
|||
|
||||
public const string CrossButtonRed = "CrossButtonRed";
|
||||
public const string RefreshButton = "RefreshButton";
|
||||
public const string HelpButton = "HelpButton";
|
||||
|
||||
public const string ItemStatus = "ItemStatus";
|
||||
public const string ItemStatusNotHeld = "ItemStatusNotHeld";
|
||||
|
|
|
|||
|
|
@ -84,8 +84,6 @@ namespace Content.Client.Stylesheets
|
|||
public const string StyleClassLabelSmall = "LabelSmall";
|
||||
public const string StyleClassButtonBig = "ButtonBig";
|
||||
|
||||
public const string StyleClassButtonHelp = "HelpButton";
|
||||
|
||||
public const string StyleClassPopupMessageSmall = "PopupMessageSmall";
|
||||
public const string StyleClassPopupMessageSmallCaution = "PopupMessageSmallCaution";
|
||||
public const string StyleClassPopupMessageMedium = "PopupMessageMedium";
|
||||
|
|
@ -1367,10 +1365,6 @@ namespace Content.Client.Stylesheets
|
|||
new StyleProperty(PanelContainer.StylePropertyPanel, new StyleBoxFlat { BackgroundColor = NanoGold, ContentMarginBottomOverride = 2, ContentMarginLeftOverride = 2}),
|
||||
}),
|
||||
|
||||
Element<TextureButton>()
|
||||
.Class(StyleClassButtonHelp)
|
||||
.Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/VerbIcons/information.svg.192dpi.png")),
|
||||
|
||||
// Labels ---
|
||||
Element<Label>().Class(StyleClassLabelBig)
|
||||
.Prop(Label.StylePropertyFont, notoSans16),
|
||||
|
|
|
|||
Loading…
Reference in New Issue