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

Help me

Browse Source
This commit is contained in:
CatTheSystem
2019-08-15 21:26:56 +03:00
parent aed1a0d985
commit 3b48926d75
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Client/UserInterface/GameHud.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using Content.Client.Utility; using Content.Client.Utility;
using Content.Shared.Input; using Content.Shared.Input;
using Robust.Client.Graphics; using Robust.Client.Graphics;
@@ -348,19 +348,19 @@ namespace Content.Client.UserInterface
switch (DrawMode) switch (DrawMode)
{ {
case DrawModeEnum.Normal: case DrawModeEnum.Normal:
StylePseudoClass = Button.StylePseudoClassNormal; AddStylePseudoClass(Button.StylePseudoClassNormal);
_textureRect.ModulateSelfOverride = ColorNormal; _textureRect.ModulateSelfOverride = ColorNormal;
_label.ModulateSelfOverride = ColorNormal; _label.ModulateSelfOverride = ColorNormal;
break; break;
case DrawModeEnum.Pressed: case DrawModeEnum.Pressed:
StylePseudoClass = Button.StylePseudoClassPressed; AddStylePseudoClass(Button.StylePseudoClassPressed);
_textureRect.ModulateSelfOverride = ColorPressed; _textureRect.ModulateSelfOverride = ColorPressed;
_label.ModulateSelfOverride = ColorPressed; _label.ModulateSelfOverride = ColorPressed;
break; break;
case DrawModeEnum.Hover: case DrawModeEnum.Hover:
StylePseudoClass = Button.StylePseudoClassHover; AddStylePseudoClass(Button.StylePseudoClassHover);
_textureRect.ModulateSelfOverride = ColorHovered; _textureRect.ModulateSelfOverride = ColorHovered;
_label.ModulateSelfOverride = ColorHovered; _label.ModulateSelfOverride = ColorHovered;
break; break;

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

@@ -211,7 +211,7 @@ namespace Content.Client.UserInterface
// Window close button hover. // Window close button hover.
new StyleRule( new StyleRule(
new SelectorElement(typeof(TextureButton), new[] {SS14Window.StyleClassWindowCloseButton}, null, new SelectorElement(typeof(TextureButton), new[] {SS14Window.StyleClassWindowCloseButton}, null,
TextureButton.StylePseudoClassHover), new [] {TextureButton.StylePseudoClassHover}),
new[] new[]
{ {
new StyleProperty(Control.StylePropertyModulateSelf, Color.FromHex("#7F3636")), new StyleProperty(Control.StylePropertyModulateSelf, Color.FromHex("#7F3636")),
@@ -219,7 +219,7 @@ namespace Content.Client.UserInterface
// Window close button pressed. // Window close button pressed.
new StyleRule( new StyleRule(
new SelectorElement(typeof(TextureButton), new[] {SS14Window.StyleClassWindowCloseButton}, null, new SelectorElement(typeof(TextureButton), new[] {SS14Window.StyleClassWindowCloseButton}, null,
TextureButton.StylePseudoClassPressed), new [] {TextureButton.StylePseudoClassPressed}),
new[] new[]
{ {
new StyleProperty(Control.StylePropertyModulateSelf, Color.FromHex("#753131")), new StyleProperty(Control.StylePropertyModulateSelf, Color.FromHex("#753131")),
@@ -227,25 +227,25 @@ namespace Content.Client.UserInterface
// Regular buttons! // Regular buttons!
new StyleRule( new StyleRule(
new SelectorElement(typeof(Button), null, null, Button.StylePseudoClassNormal), new SelectorElement(typeof(Button), null, null, new [] {Button.StylePseudoClassNormal}),
new[] new[]
{ {
new StyleProperty(Button.StylePropertyStyleBox, buttonNormal), new StyleProperty(Button.StylePropertyStyleBox, buttonNormal),
}), }),
new StyleRule( new StyleRule(
new SelectorElement(typeof(Button), null, null, Button.StylePseudoClassHover), new SelectorElement(typeof(Button), null, null, new [] {Button.StylePseudoClassHover}),
new[] new[]
{ {
new StyleProperty(Button.StylePropertyStyleBox, buttonHover), new StyleProperty(Button.StylePropertyStyleBox, buttonHover),
}), }),
new StyleRule( new StyleRule(
new SelectorElement(typeof(Button), null, null, Button.StylePseudoClassPressed), new SelectorElement(typeof(Button), null, null, new [] {Button.StylePseudoClassPressed}),
new[] new[]
{ {
new StyleProperty(Button.StylePropertyStyleBox, buttonPressed), new StyleProperty(Button.StylePropertyStyleBox, buttonPressed),
}), }),
new StyleRule( new StyleRule(
new SelectorElement(typeof(Button), null, null, Button.StylePseudoClassDisabled), new SelectorElement(typeof(Button), null, null, new [] {Button.StylePseudoClassDisabled}),
new[] new[]
{ {
new StyleProperty(Button.StylePropertyStyleBox, buttonDisabled), new StyleProperty(Button.StylePropertyStyleBox, buttonDisabled),
@@ -283,7 +283,7 @@ namespace Content.Client.UserInterface
new StyleProperty("font-color", new Color(192, 192, 192)), new StyleProperty("font-color", new Color(192, 192, 192)),
}), }),
new StyleRule(new SelectorElement(typeof(LineEdit), null, null, LineEdit.StylePseudoClassPlaceholder), new StyleRule(new SelectorElement(typeof(LineEdit), null, null, new [] {LineEdit.StylePseudoClassPlaceholder}),
new[] new[]
{ {
new StyleProperty("font-color", Color.Gray), new StyleProperty("font-color", Color.Gray),
@@ -306,14 +306,14 @@ namespace Content.Client.UserInterface
vScrollBarGrabberNormal), vScrollBarGrabberNormal),
}), }),
new StyleRule(new SelectorElement(typeof(VScrollBar), null, null, ScrollBar.StylePseudoClassHover), new StyleRule(new SelectorElement(typeof(VScrollBar), null, null, new [] {ScrollBar.StylePseudoClassHover}),
new[] new[]
{ {
new StyleProperty(ScrollBar.StylePropertyGrabber, new StyleProperty(ScrollBar.StylePropertyGrabber,
vScrollBarGrabberHover), vScrollBarGrabberHover),
}), }),
new StyleRule(new SelectorElement(typeof(VScrollBar), null, null, ScrollBar.StylePseudoClassGrabbed), new StyleRule(new SelectorElement(typeof(VScrollBar), null, null, new [] {ScrollBar.StylePseudoClassGrabbed}),
new[] new[]
{ {
new StyleProperty(ScrollBar.StylePropertyGrabber, new StyleProperty(ScrollBar.StylePropertyGrabber,
@@ -327,14 +327,14 @@ namespace Content.Client.UserInterface
hScrollBarGrabberNormal), hScrollBarGrabberNormal),
}), }),
new StyleRule(new SelectorElement(typeof(HScrollBar), null, null, ScrollBar.StylePseudoClassHover), new StyleRule(new SelectorElement(typeof(HScrollBar), null, null, new [] {ScrollBar.StylePseudoClassHover}),
new[] new[]
{ {
new StyleProperty(ScrollBar.StylePropertyGrabber, new StyleProperty(ScrollBar.StylePropertyGrabber,
hScrollBarGrabberHover), hScrollBarGrabberHover),
}), }),
new StyleRule(new SelectorElement(typeof(HScrollBar), null, null, ScrollBar.StylePseudoClassGrabbed), new StyleRule(new SelectorElement(typeof(HScrollBar), null, null, new [] {ScrollBar.StylePseudoClassGrabbed}),
new[] new[]
{ {
new StyleProperty(ScrollBar.StylePropertyGrabber, new StyleProperty(ScrollBar.StylePropertyGrabber,
@@ -355,7 +355,7 @@ namespace Content.Client.UserInterface
new StyleProperty(CheckBox.StylePropertyIcon, checkBoxTextureUnchecked), new StyleProperty(CheckBox.StylePropertyIcon, checkBoxTextureUnchecked),
}), }),
new StyleRule(new SelectorElement(typeof(CheckBox), null, null, Button.StylePseudoClassPressed), new[] new StyleRule(new SelectorElement(typeof(CheckBox), null, null, new [] {Button.StylePseudoClassPressed}), new[]
{ {
new StyleProperty(CheckBox.StylePropertyIcon, checkBoxTextureChecked), new StyleProperty(CheckBox.StylePropertyIcon, checkBoxTextureChecked),
}), }),
@@ -459,19 +459,19 @@ namespace Content.Client.UserInterface
// Those top menu buttons. // Those top menu buttons.
new StyleRule( new StyleRule(
new SelectorElement(typeof(GameHud.TopButton), null, null, Button.StylePseudoClassNormal), new [] new SelectorElement(typeof(GameHud.TopButton), null, null, new [] {Button.StylePseudoClassNormal}), new []
{ {
new StyleProperty(Button.StylePropertyStyleBox, buttonNormal), new StyleProperty(Button.StylePropertyStyleBox, buttonNormal),
}), }),
new StyleRule( new StyleRule(
new SelectorElement(typeof(GameHud.TopButton), null, null, Button.StylePseudoClassPressed), new [] new SelectorElement(typeof(GameHud.TopButton), null, null, new [] {Button.StylePseudoClassPressed}), new []
{ {
new StyleProperty(Button.StylePropertyStyleBox, buttonPressed), new StyleProperty(Button.StylePropertyStyleBox, buttonPressed),
}), }),
new StyleRule( new StyleRule(
new SelectorElement(typeof(GameHud.TopButton), null, null, Button.StylePseudoClassHover), new [] new SelectorElement(typeof(GameHud.TopButton), null, null, new [] {Button.StylePseudoClassHover}), new []
{ {
new StyleProperty(Button.StylePropertyStyleBox, buttonHover), new StyleProperty(Button.StylePropertyStyleBox, buttonHover),
}), }),