Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[feat] New Interface (#10)

Browse Source
This commit is contained in:
rhailrake
2023-05-01 16:36:41 +06:00
committed by Aviu00
parent c14cabae3a
commit 0deda77a06
71 changed files with 1855 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml
View File

@@ -1,6 +1,6 @@
<DefaultWindow xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.Bwoink"
SetSize="900 500"
SetSize="1000 500"
HeaderClass="windowHeaderAlert"
TitleClass="windowTitleAlert"
Title="{Loc 'bwoink-user-title'}" >

2
Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
View File

@@ -42,7 +42,7 @@ namespace Content.Client.Administration.UI.CustomControls
PopulateList(_adminSystem.PlayerList);
FilterLineEdit.OnTextChanged += _ => FilterList();
_adminSystem.PlayerListChanged += PopulateList;
BackgroundPanel.PanelOverride = new StyleBoxFlat {BackgroundColor = new Color(32, 32, 40)};
BackgroundPanel.PanelOverride = new StyleBoxFlat {BackgroundColor = new Color(32, 48, 32)};
}
private void PlayerListItemPressed(BaseButton.ButtonEventArgs? args, ListData? data)

6
Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
View File

@@ -43,7 +43,7 @@
<!-- Vent devices -->
<PanelContainer VerticalExpand="True">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#212723" />
</PanelContainer.PanelOverride>
<ScrollContainer>
@@ -53,7 +53,7 @@
<!-- Scrubber devices -->
<PanelContainer VerticalExpand="True">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#212723" />
</PanelContainer.PanelOverride>
<ScrollContainer>
@@ -63,7 +63,7 @@
<!-- Sensors -->
<PanelContainer VerticalExpand="True">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#212723" />
</PanelContainer.PanelOverride>
<ScrollContainer>

9
Content.Client/Chemistry/UI/ChemMasterWindow.xaml
View File

@@ -15,9 +15,8 @@
<PanelContainer VerticalExpand="True" MinSize="0 200">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#212723" />
</PanelContainer.PanelOverride>
<ScrollContainer HorizontalExpand="True" MinSize="0 200">
<!-- Initially empty, when server sends state data this will have container contents and fill volume.-->
<BoxContainer Name="InputContainerInfo" Orientation="Vertical" Margin="4" HorizontalExpand="True">
@@ -40,7 +39,7 @@
<!-- Buffer info -->
<PanelContainer VerticalExpand="True" MinSize="0 200">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#212723" />
</PanelContainer.PanelOverride>
<ScrollContainer HorizontalExpand="True" MinSize="0 200">
@@ -62,7 +61,7 @@
<PanelContainer VerticalExpand="True" MinSize="0 200">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#212723" />
</PanelContainer.PanelOverride>
<ScrollContainer HorizontalExpand="True" MinSize="0 200">
@@ -87,7 +86,7 @@
<!-- Wrap the packaging info-->
<PanelContainer>
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#212723" />
</PanelContainer.PanelOverride>
<!-- Packaging Info -->

2
Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml
View File

@@ -40,7 +40,7 @@
SizeFlagsStretchRatio="6"
MinSize="0 150">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1b1b1e" />
<gfx:StyleBoxFlat BackgroundColor="#212723" />
</PanelContainer.PanelOverride>
<BoxContainer Name="ContainerInfo"
Orientation="Vertical"

2
Content.Client/Configurable/UI/ConfigurationMenu.cs
View File

@@ -63,7 +63,7 @@ namespace Content.Client.Configurable.UI
{
VerticalExpand = true,
HorizontalExpand = true,
ModulateSelfOverride = Color.FromHex("#202025")
ModulateSelfOverride = Color.FromHex("#3C4841")
};
outerColumn.AddChild(_column);

2
Content.Client/Gravity/UI/GravityGeneratorWindow.xaml
View File

@@ -2,7 +2,7 @@
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
Title="{Loc 'gravity-generator-window-title'}"
MinSize="270 130"
SetSize="360 180">
SetSize="440 180">
<BoxContainer Margin="4 0" Orientation="Horizontal">
<BoxContainer Orientation="Vertical" HorizontalExpand="True">
<GridContainer Margin="2 0 0 0" Columns="2">

2
Content.Client/Mech/Ui/MechMenu.xaml
View File

@@ -49,7 +49,7 @@
<BoxContainer VerticalExpand="True" Margin="10 0 10 10" Orientation="Vertical">
<PanelContainer VerticalExpand="True" MinSize="0 200">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
<gfx:StyleBoxFlat BackgroundColor="#212723" />
</PanelContainer.PanelOverride>
<ScrollContainer
HScrollEnabled="False"

2
Content.Client/Options/UI/OptionsMenu.xaml
View File

@@ -1,7 +1,7 @@
<DefaultWindow xmlns="https://spacestation14.io"
xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
Title="{Loc 'ui-options-title'}"
MinSize="800 450">
MinSize="980 450">
<TabContainer Name="Tabs" Access="Public">
<tabs:MiscTab Name="MiscTab" />
<tabs:GraphicsTab Name="GraphicsTab" />

2
Content.Client/PDA/PdaMenu.xaml
View File

@@ -10,7 +10,7 @@
<pda:PdaNavigationButton Name="SettingsButton" MinWidth="100" LabelText="{Loc 'comp-pda-io-settings-button'}"/>
<pda:PdaNavigationButton Name="ProgramTitle" Access="Public" BorderThickness="0 0 0 2" CurrentTabBorderThickness="2 0 0 2"
ActiveBgColor="#202023" Visible="False"/>
ActiveBgColor="#203023" Visible="False"/>
<pda:PdaNavigationButton HorizontalExpand="True"/>

2
Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
View File

@@ -57,7 +57,7 @@ namespace Content.Client.Preferences.UI
var back = new StyleBoxTexture
{
Texture = panelTex,
Modulate = new Color(37, 37, 42)
Modulate = new Color(37, 42, 37)
};
back.SetPatchMargin(StyleBox.Margin.All, 10);

2
Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
View File

@@ -43,7 +43,7 @@ namespace Content.Client.Preferences.UI
{
PanelOverride = new StyleBoxFlat()
{
BackgroundColor = new Color(47, 47, 53),
BackgroundColor = new Color(35, 48, 35),
ContentMarginTopOverride = 10,
ContentMarginBottomOverride = 10,
ContentMarginLeftOverride = 10,

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

@@ -47,7 +47,7 @@ namespace Content.Client.Stylesheets
(
new []
{
"/Fonts/NotoSans/NotoSans-Regular.ttf",
"/Fonts/IBMPlexSans/IBMPlexSans-Regular.ttf",
"/Fonts/NotoSans/NotoSansSymbols-Regular.ttf",
"/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf"
},
@@ -57,7 +57,7 @@ namespace Content.Client.Stylesheets
(
new []
{
"/Fonts/NotoSans/NotoSans-Italic.ttf",
"/Fonts/IBMPlexSans/IBMPlexSans-Italic.ttf",
"/Fonts/NotoSans/NotoSansSymbols-Regular.ttf",
"/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf"
},
@@ -124,7 +124,7 @@ namespace Content.Client.Stylesheets
var vScrollBarGrabberNormal = new StyleBoxFlat
{
BackgroundColor = Color.Gray.WithAlpha(0.35f), ContentMarginLeftOverride = DefaultGrabberSize,
BackgroundColor = Color.DarkKhaki.WithAlpha(0.35f), ContentMarginLeftOverride = DefaultGrabberSize,
ContentMarginTopOverride = DefaultGrabberSize
};
var vScrollBarGrabberHover = new StyleBoxFlat
@@ -140,7 +140,7 @@ namespace Content.Client.Stylesheets
var hScrollBarGrabberNormal = new StyleBoxFlat
{
BackgroundColor = Color.Gray.WithAlpha(0.35f), ContentMarginTopOverride = DefaultGrabberSize
BackgroundColor = Color.DarkKhaki.WithAlpha(0.35f), ContentMarginTopOverride = DefaultGrabberSize
};
var hScrollBarGrabberHover = new StyleBoxFlat
{

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

@@ -29,7 +29,7 @@ namespace Content.Client.Stylesheets
// Ew, but ok
new[]
{
$"/Fonts/NotoSans{ds}/NotoSans{ds}-{variation}.ttf",
$"/Fonts/IBMPlexSans/IBMPlexSans-{variation}.ttf",
$"/Fonts/NotoSans/NotoSansSymbols-{sv}.ttf",
"/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf",
},
@@ -64,6 +64,8 @@ namespace Content.Client.Stylesheets
public const string StyleClassChatChannelSelectorButton = "chatSelectorOptionButton";
public const string StyleClassChatFilterOptionButton = "chatFilterOptionButton";
public const string StyleClassStorageButton = "storageButton";
public const string StyleClassFuckyWuckyBackground = "FuckyWuckyBackground";
public const string StyleClassGayShitBackground = "GayShitBackground";
public const string StyleClassSliderRed = "Red";
public const string StyleClassSliderGreen = "Green";
@@ -85,18 +87,18 @@ namespace Content.Client.Stylesheets
public static readonly Color PanelDark = Color.FromHex("#1E1E22");
public static readonly Color NanoGold = Color.FromHex("#A88B5E");
public static readonly Color GoodGreenFore = Color.FromHex("#31843E");
public static readonly Color ConcerningOrangeFore = Color.FromHex("#A5762F");
public static readonly Color DangerousRedFore = Color.FromHex("#BB3232");
public static readonly Color DisabledFore = Color.FromHex("#5A5A5A");
public static readonly Color NanoGold = Color.FromHex("#A2B1A8");
public static readonly Color GoodGreenFore = Color.FromHex("#4D5B5C");
public static readonly Color ConcerningOrangeFore = Color.FromHex("#5C5A4D");
public static readonly Color DangerousRedFore = Color.FromHex("#5C4D5B");
public static readonly Color DisabledFore = Color.FromHex("#262E29");
public static readonly Color ButtonColorDefault = Color.FromHex("#464966");
public static readonly Color ButtonColorDefaultRed = Color.FromHex("#D43B3B");
public static readonly Color ButtonColorHovered = Color.FromHex("#575b7f");
public static readonly Color ButtonColorHoveredRed = Color.FromHex("#DF6B6B");
public static readonly Color ButtonColorPressed = Color.FromHex("#3e6c45");
public static readonly Color ButtonColorDisabled = Color.FromHex("#30313c");
public static readonly Color ButtonColorDefault = Color.FromHex("#4D5D53");
public static readonly Color ButtonColorDefaultRed = Color.FromHex("#992723");
public static readonly Color ButtonColorHovered = Color.FromHex("#58695E");
public static readonly Color ButtonColorHoveredRed = Color.FromHex("#4D5D53");
public static readonly Color ButtonColorPressed = Color.FromHex("#000000");
public static readonly Color ButtonColorDisabled = Color.FromHex("#000000");
public static readonly Color ButtonColorCautionDefault = Color.FromHex("#ab3232");
public static readonly Color ButtonColorCautionHovered = Color.FromHex("#cf2f2f");
@@ -113,20 +115,23 @@ namespace Content.Client.Stylesheets
// Context menu button colors
public static readonly Color ButtonColorContext = Color.FromHex("#1119");
public static readonly Color ButtonColorContextHover = Color.DarkSlateGray;
public static readonly Color ButtonColorContextPressed = Color.LightSlateGray;
public static readonly Color ButtonColorContextDisabled = Color.Black;
public static readonly Color ButtonColorContextHover = Color.FromHex("#6E8476");
public static readonly Color ButtonColorContextPressed = Color.FromHex("#879B8F");
public static readonly Color ButtonColorContextDisabled = Color.FromHex("#262E29");
// Examine button colors
public static readonly Color ExamineButtonColorContext = Color.Transparent;
public static readonly Color ExamineButtonColorContextHover = Color.DarkSlateGray;
public static readonly Color ExamineButtonColorContextPressed = Color.LightSlateGray;
public static readonly Color ExamineButtonColorContextDisabled = Color.FromHex("#5A5A5A");
public static readonly Color ExamineButtonColorContextHover = Color.FromHex("#6E8476");
public static readonly Color ExamineButtonColorContextPressed = Color.FromHex("#879B8F");
public static readonly Color ExamineButtonColorContextDisabled = Color.FromHex("#262E29");
// UI Panel colors
public static readonly Color PanelColorDark = Color.FromHex("#1B211D");
// Fancy Tree elements
public static readonly Color FancyTreeEvenRowColor = Color.FromHex("#25252A");
public static readonly Color FancyTreeOddRowColor = FancyTreeEvenRowColor * new Color(0.8f, 0.8f, 0.8f);
public static readonly Color FancyTreeSelectedRowColor = new Color(55, 55, 68);
public static readonly Color FancyTreeEvenRowColor = Color.FromHex("#313B35");
public static readonly Color FancyTreeOddRowColor = FancyTreeEvenRowColor * new Color(0.8f, 0.9f, 0.8f);
public static readonly Color FancyTreeSelectedRowColor = new Color(55, 80, 68);
//Used by the APC and SMES menus
public const string StyleClassPowerStateNone = "PowerStateNone";
@@ -180,10 +185,11 @@ namespace Content.Client.Stylesheets
ExpandMarginBottom = 3,
ContentMarginBottomOverride = 0
};
var windowBackgroundTex = resCache.GetTexture("/Textures/Interface/Nano/window_background.png");
var windowBackgroundTex = resCache.GetTexture("/Textures/Interface/Nano/gay_shit.png");
var windowBackground = new StyleBoxTexture
{
Texture = windowBackgroundTex,
Mode = StyleBoxTexture.StretchMode.Tile
};
windowBackground.SetPatchMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2);
windowBackground.SetExpandMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2);
@@ -195,6 +201,27 @@ namespace Content.Client.Stylesheets
};
borderedWindowBackground.SetPatchMargin(StyleBox.Margin.All, 2);
var fuckyWuckyBackgroundTex = resCache.GetTexture("/Textures/Interface/Nano/fucky_wucky.png");
var fuckyWuckyBackground = new StyleBoxTexture
{
Texture = fuckyWuckyBackgroundTex,
Mode = StyleBoxTexture.StretchMode.Tile
};
fuckyWuckyBackground.SetPatchMargin(StyleBox.Margin.All, 24);
fuckyWuckyBackground.SetExpandMargin(StyleBox.Margin.All, -4);
fuckyWuckyBackground.SetContentMarginOverride(StyleBox.Margin.All, 8);
var gayShitBackgroundTex = resCache.GetTexture("/Textures/Interface/Nano/gay_shit.png");
var gayShitBackground = new StyleBoxTexture
{
Texture = gayShitBackgroundTex,
Mode = StyleBoxTexture.StretchMode.Tile
};
gayShitBackground.SetPatchMargin(StyleBox.Margin.All, 2);
gayShitBackground.SetExpandMargin(StyleBox.Margin.All, -2);
var contextMenuBackground = new StyleBoxTexture
{
Texture = borderedWindowBackgroundTex,
@@ -361,14 +388,14 @@ namespace Content.Client.Stylesheets
};
tabContainerPanel.SetPatchMargin(StyleBox.Margin.All, 2);
var tabContainerBoxActive = new StyleBoxFlat {BackgroundColor = new Color(64, 64, 64)};
var tabContainerBoxActive = new StyleBoxFlat {BackgroundColor = new Color(64, 80, 64)};
tabContainerBoxActive.SetContentMarginOverride(StyleBox.Margin.Horizontal, 5);
var tabContainerBoxInactive = new StyleBoxFlat {BackgroundColor = new Color(32, 32, 32)};
var tabContainerBoxInactive = new StyleBoxFlat {BackgroundColor = new Color(32, 40, 32)};
tabContainerBoxInactive.SetContentMarginOverride(StyleBox.Margin.Horizontal, 5);
var progressBarBackground = new StyleBoxFlat
{
BackgroundColor = new Color(0.25f, 0.25f, 0.25f)
BackgroundColor = new Color(0.25f, 0.35f, 0.25f)
};
progressBarBackground.SetContentMarginOverride(StyleBox.Margin.Vertical, 14.5f);
@@ -407,13 +434,13 @@ namespace Content.Client.Stylesheets
placeholder.SetExpandMargin(StyleBox.Margin.All, -5);
placeholder.Mode = StyleBoxTexture.StretchMode.Tile;
var itemListBackgroundSelected = new StyleBoxFlat {BackgroundColor = new Color(75, 75, 86)};
var itemListBackgroundSelected = new StyleBoxFlat {BackgroundColor = new Color(75, 90, 75)};
itemListBackgroundSelected.SetContentMarginOverride(StyleBox.Margin.Vertical, 2);
itemListBackgroundSelected.SetContentMarginOverride(StyleBox.Margin.Horizontal, 4);
var itemListItemBackgroundDisabled = new StyleBoxFlat {BackgroundColor = new Color(10, 10, 12)};
var itemListItemBackgroundDisabled = new StyleBoxFlat {BackgroundColor = new Color(10, 20, 10)};
itemListItemBackgroundDisabled.SetContentMarginOverride(StyleBox.Margin.Vertical, 2);
itemListItemBackgroundDisabled.SetContentMarginOverride(StyleBox.Margin.Horizontal, 4);
var itemListItemBackground = new StyleBoxFlat {BackgroundColor = new Color(55, 55, 68)};
var itemListItemBackground = new StyleBoxFlat {BackgroundColor = new Color(55, 70, 55)};
itemListItemBackground.SetContentMarginOverride(StyleBox.Margin.Vertical, 2);
itemListItemBackground.SetContentMarginOverride(StyleBox.Margin.Horizontal, 4);
var itemListItemBackgroundTransparent = new StyleBoxFlat {BackgroundColor = Color.Transparent};
@@ -457,19 +484,19 @@ namespace Content.Client.Stylesheets
var sliderFillBox = new StyleBoxTexture
{
Texture = sliderFillTex,
Modulate = Color.FromHex("#3E6C45")
Modulate = Color.FromHex("#313B35")
};
var sliderBackBox = new StyleBoxTexture
{
Texture = sliderFillTex,
Modulate = PanelDark,
Modulate = Color.FromHex("#1B211D")
};
var sliderForeBox = new StyleBoxTexture
{
Texture = sliderOutlineTex,
Modulate = Color.FromHex("#494949")
Modulate = Color.FromHex("#47554C")
};
var sliderGrabBox = new StyleBoxTexture
@@ -492,7 +519,7 @@ namespace Content.Client.Stylesheets
var insetBack = new StyleBoxTexture
{
Texture = buttonTex,
Modulate = Color.FromHex("#202023"),
Modulate = Color.FromHex("#212723"),
};
insetBack.SetPatchMargin(StyleBox.Margin.All, 10);
@@ -539,6 +566,20 @@ namespace Content.Client.Stylesheets
{
new StyleProperty(PanelContainer.StylePropertyPanel, windowBackground),
}),
// Chat background.
new StyleRule(
new SelectorElement(null, new[] {StyleClassFuckyWuckyBackground}, null, null),
new[]
{
new StyleProperty(PanelContainer.StylePropertyPanel, fuckyWuckyBackground),
}),
// Panel background.
new StyleRule(
new SelectorElement(null, new[] {StyleClassGayShitBackground}, null, null),
new[]
{
new StyleProperty(PanelContainer.StylePropertyPanel, gayShitBackground),
}),
// bordered window background
new StyleRule(
new SelectorElement(null, new[] {StyleClassBorderedWindowPanel}, null, null),
@@ -651,7 +692,7 @@ namespace Content.Client.Stylesheets
new SelectorElement(typeof(Label), null, null, null)),
new[]
{
new StyleProperty("font-color", Color.FromHex("#E5E5E581")),
new StyleProperty("font-color", Color.FromHex("#3C484181")),
}),
// Context Menu window
@@ -772,19 +813,19 @@ namespace Content.Client.Stylesheets
Element<ContainerButton>().Class(ListContainer.StyleClassListContainerButton)
.Pseudo(ContainerButton.StylePseudoClassNormal)
.Prop(Control.StylePropertyModulateSelf, new Color(55, 55, 68)),
.Prop(Control.StylePropertyModulateSelf, new Color(55, 80, 68)),
Element<ContainerButton>().Class(ListContainer.StyleClassListContainerButton)
.Pseudo(ContainerButton.StylePseudoClassHover)
.Prop(Control.StylePropertyModulateSelf, new Color(75, 75, 86)),
.Prop(Control.StylePropertyModulateSelf, new Color(75, 90, 86)),
Element<ContainerButton>().Class(ListContainer.StyleClassListContainerButton)
.Pseudo(ContainerButton.StylePseudoClassPressed)
.Prop(Control.StylePropertyModulateSelf, new Color(75, 75, 86)),
.Prop(Control.StylePropertyModulateSelf, new Color(75, 90, 86)),
Element<ContainerButton>().Class(ListContainer.StyleClassListContainerButton)
.Pseudo(ContainerButton.StylePseudoClassDisabled)
.Prop(Control.StylePropertyModulateSelf, new Color(10, 10, 12)),
.Prop(Control.StylePropertyModulateSelf, new Color(10, 20, 12)),
// Main menu: Make those buttons bigger.
new StyleRule(new SelectorChild(
@@ -813,14 +854,14 @@ namespace Content.Client.Stylesheets
new SelectorElement(typeof(LineEdit), new[] {LineEdit.StyleClassLineEditNotEditable}, null, null),
new[]
{
new StyleProperty("font-color", new Color(192, 192, 192)),
new StyleProperty("font-color", new Color(192, 255, 192)),
}),
new StyleRule(
new SelectorElement(typeof(LineEdit), null, null, new[] {LineEdit.StylePseudoClassPlaceholder}),
new[]
{
new StyleProperty("font-color", Color.Gray),
new StyleProperty("font-color", Color.FromHex("#95A69B")),
}),
Element<TextEdit>().Pseudo(TextEdit.StylePseudoClassPlaceholder)
@@ -977,7 +1018,7 @@ namespace Content.Client.Stylesheets
new StyleRule(new SelectorElement(typeof(ItemList), null, null, null), new[]
{
new StyleProperty(ItemList.StylePropertyBackground,
new StyleBoxFlat {BackgroundColor = new Color(32, 32, 40)}),
new StyleBoxFlat {BackgroundColor = new Color(32, 40, 32)}),
new StyleProperty(ItemList.StylePropertyItemBackground,
itemListItemBackground),
new StyleProperty(ItemList.StylePropertyDisabledItemBackground,
@@ -1002,10 +1043,10 @@ namespace Content.Client.Stylesheets
new StyleRule(new SelectorElement(typeof(Tree), null, null, null), new[]
{
new StyleProperty(Tree.StylePropertyBackground,
new StyleBoxFlat {BackgroundColor = new Color(32, 32, 40)}),
new StyleBoxFlat {BackgroundColor = new Color(32, 40, 32)}),
new StyleProperty(Tree.StylePropertyItemBoxSelected, new StyleBoxFlat
{
BackgroundColor = new Color(55, 55, 68),
BackgroundColor = new Color(55, 75, 68),
ContentMarginLeftOverride = 4
})
}),
@@ -1020,7 +1061,7 @@ namespace Content.Client.Stylesheets
new SelectorElement(typeof(Label), new[] {Placeholder.StyleClassPlaceholderText}, null, null), new[]
{
new StyleProperty(Label.StylePropertyFont, notoSans16),
new StyleProperty(Label.StylePropertyFontColor, new Color(103, 103, 103, 128)),
new StyleProperty(Label.StylePropertyFontColor, new Color(103, 133, 103, 128)),
}),
// Big Label
@@ -1293,12 +1334,12 @@ namespace Content.Client.Stylesheets
Element<PanelContainer>().Class(ClassAngleRect)
.Prop(PanelContainer.StylePropertyPanel, BaseAngleRect)
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#25252A")),
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#253025")),
Element<PanelContainer>().Class(ClassLowDivider)
.Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat
{
BackgroundColor = Color.FromHex("#444"),
BackgroundColor = Color.FromHex("#303530"),
ContentMarginLeftOverride = 2,
ContentMarginBottomOverride = 2
}),
@@ -1310,7 +1351,7 @@ namespace Content.Client.Stylesheets
Element<PanelContainer>().Class("WindowHeadingBackground")
.Prop("panel", new StyleBoxTexture(BaseButtonOpenLeft) { Padding = default })
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#1F1F23")),
.Prop(Control.StylePropertyModulateSelf, PanelColorDark),
Element<PanelContainer>().Class("WindowHeadingBackgroundLight")
.Prop("panel", new StyleBoxTexture(BaseButtonOpenLeft) { Padding = default }),
@@ -1318,7 +1359,7 @@ namespace Content.Client.Stylesheets
//The lengths you have to go through to change a background color smh
Element<PanelContainer>().Class("PanelBackgroundBaseDark")
.Prop("panel", new StyleBoxTexture(BaseButtonOpenBoth) { Padding = default })
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#1F1F23")),
.Prop(Control.StylePropertyModulateSelf, PanelColorDark),
Element<PanelContainer>().Class("PanelBackgroundLight")
.Prop("panel", new StyleBoxTexture(BaseButtonOpenBoth) { Padding = default })
@@ -1327,11 +1368,15 @@ namespace Content.Client.Stylesheets
// Window Footer
Element<TextureRect>().Class("NTLogoDark")
.Prop(TextureRect.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Nano/ntlogo.svg.png"))
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#757575")),
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#7A9082")),
Element<Label>().Class("WindowFooterText")
.Prop(Label.StylePropertyFont, notoSans8)
.Prop(Label.StylePropertyFontColor, Color.FromHex("#757575")),
.Prop(Label.StylePropertyFontColor, Color.FromHex("#7A9082")),
Element<PanelContainer>().Class("PanelBackgroundAngledDark")
.Prop(PanelContainer.StylePropertyPanel, BaseAngleRect)
.Prop(Control.StylePropertyModulateSelf, PanelColorDark),
// X Texture button ---
Element<TextureButton>().Class("CrossButtonRed")
@@ -1339,10 +1384,10 @@ namespace Content.Client.Stylesheets
.Prop(Control.StylePropertyModulateSelf, DangerousRedFore),
Element<TextureButton>().Class("CrossButtonRed").Pseudo(TextureButton.StylePseudoClassHover)
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#7F3636")),
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#5C4D51")),
Element<TextureButton>().Class("CrossButtonRed").Pseudo(TextureButton.StylePseudoClassHover)
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#753131")),
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#5C4D51")),
// ---
// The default look of paper in UIs. Pages can have components which override this
@@ -1399,7 +1444,7 @@ namespace Content.Client.Stylesheets
//PDA - Backgrounds
Element<PanelContainer>().Class("PdaContentBackground")
.Prop(PanelContainer.StylePropertyPanel, BaseButtonOpenBoth)
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#25252a")),
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#262E29")),
Element<PanelContainer>().Class("PdaBackground")
.Prop(PanelContainer.StylePropertyPanel, BaseButtonOpenBoth)
@@ -1407,13 +1452,13 @@ namespace Content.Client.Stylesheets
Element<PanelContainer>().Class("PdaBackgroundRect")
.Prop(PanelContainer.StylePropertyPanel, BaseAngleRect)
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#717059")),
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#7A9082")),
Element<PanelContainer>().Class("PdaBorderRect")
.Prop(PanelContainer.StylePropertyPanel, AngleBorderRect),
Element<PanelContainer>().Class("BackgroundDark")
.Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat(Color.FromHex("#25252A"))),
.Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat(Color.FromHex("#262E29"))),
//PDA - Buttons
Element<PdaSettingsButton>().Pseudo(ContainerButton.StylePseudoClassNormal)
@@ -1444,11 +1489,11 @@ namespace Content.Client.Stylesheets
//PDA - Text
Element<Label>().Class("PdaContentFooterText")
.Prop(Label.StylePropertyFont, notoSans10)
.Prop(Label.StylePropertyFontColor, Color.FromHex("#757575")),
.Prop(Label.StylePropertyFontColor, Color.FromHex("#7A9082")),
Element<Label>().Class("PdaWindowFooterText")
.Prop(Label.StylePropertyFont, notoSans10)
.Prop(Label.StylePropertyFontColor, Color.FromHex("#333d3b")),
.Prop(Label.StylePropertyFontColor, Color.FromHex("#4D5D53")),
// Fancy Tree
Element<ContainerButton>().Identifier(TreeItem.StyleIdentifierTreeButton)

6
Content.Client/UserInterface/Controls/MenuButton.cs
View File

@@ -15,9 +15,9 @@ public sealed class MenuButton : ContainerButton
public const string StyleClassLabelTopButton = "topButtonLabel";
public const string StyleClassRedTopButton = "topButtonLabel";
private static readonly Color ColorNormal = Color.FromHex("#7b7e9e");
private static readonly Color ColorRedNormal = Color.FromHex("#FEFEFE");
private static readonly Color ColorHovered = Color.FromHex("#9699bb");
private static readonly Color ColorNormal = Color.FromHex("#879B8F");
private static readonly Color ColorRedNormal = Color.FromHex("#aC4D5B");
private static readonly Color ColorHovered = Color.FromHex("#ffffff");
private static readonly Color ColorRedHovered = Color.FromHex("#FFFFFF");
private static readonly Color ColorPressed = Color.FromHex("#789B8C");

6
Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
View File

@@ -26,10 +26,8 @@
</BoxContainer>
<alerts:AlertsUI Name="Alerts" Access="Protected" />
</LayoutContainer>
<PanelContainer HorizontalExpand="True" MinWidth="300">
<PanelContainer.PanelOverride>
<graphics:StyleBoxFlat BackgroundColor="#2B2C3B" />
</PanelContainer.PanelOverride>
<PanelContainer HorizontalExpand="True" MinWidth="300" StyleClasses="GayShitBackground">
<BoxContainer Orientation="Vertical" HorizontalExpand="True" SeparationOverride="10" Margin="10">
<menuBar:GameTopMenuBar Name="TopBar" HorizontalExpand="True" Access="Protected" />

2
Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
View File

@@ -112,7 +112,7 @@ namespace Content.Client.UserInterface.Systems.Atmos.GasTank
var middle = new PanelContainer
{
PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#202025")},
PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#3C4841")},
Children =
{
(_contentContainer = new BoxContainer

50
Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
View File

@@ -1,4 +1,3 @@
using System.Globalization;
using System.Linq;
using System.Numerics;
using Content.Client.Administration.Managers;
@@ -19,6 +18,8 @@ using Content.Shared.Damage.ForceSay;
using Content.Shared.Examine;
using Content.Shared.Input;
using Content.Shared.Radio;
using Content.Shared.White;
using Content.Shared.White.Utils;
using Robust.Client.Graphics;
using Robust.Client.Input;
using Robust.Client.Player;
@@ -235,19 +236,28 @@ public sealed class ChatUIController : UIController
}
ChatBox chatBox;
string? chatSizeRaw;
//White modification start
string chatSizeRaw;
Vector2 chatSize;
//End
switch (UIManager.ActiveScreen)
{
case DefaultGameScreen defaultScreen:
chatBox = defaultScreen.ChatBox;
chatSizeRaw = _config.GetCVar(CCVars.DefaultScreenChatSize);
SetChatSizing(chatSizeRaw, defaultScreen, setting);
//White modification start
chatSizeRaw = _config.GetCVar(WhiteCVars.DefaultChatSize);
chatSize = Vector2Utils.ParseVector2FromString(chatSizeRaw, ';');
//End
SetChatSizing(chatSize, defaultScreen, setting);
break;
case SeparatedChatGameScreen separatedScreen:
chatBox = separatedScreen.ChatBox;
chatSizeRaw = _config.GetCVar(CCVars.SeparatedScreenChatSize);
SetChatSizing(chatSizeRaw, separatedScreen, setting);
//White modification start
chatSizeRaw = _config.GetCVar(WhiteCVars.SeparatedChatSize);
chatSize = Vector2Utils.ParseVector2FromString(chatSizeRaw, ';');
//End
SetChatSizing(chatSize, separatedScreen, setting);
break;
default:
// this could be better?
@@ -261,7 +271,7 @@ public sealed class ChatUIController : UIController
chatBox.Main = setting;
}
private void SetChatSizing(string sizing, InGameScreen screen, bool setting)
private void SetChatSizing(Vector2 sizing, InGameScreen screen, bool setting)
{
if (!setting)
{
@@ -271,19 +281,9 @@ public sealed class ChatUIController : UIController
screen.OnChatResized += StoreChatSize;
if (string.IsNullOrEmpty(sizing))
{
return;
}
var split = sizing.Split(",");
var chatSize = new Vector2(
float.Parse(split[0], CultureInfo.InvariantCulture),
float.Parse(split[1], CultureInfo.InvariantCulture));
screen.SetChatSize(chatSize);
//White modification start
screen.SetChatSize(sizing);
//End
}
private void StoreChatSize(Vector2 size)
@@ -293,15 +293,17 @@ public sealed class ChatUIController : UIController
throw new Exception("Cannot get active screen!");
}
var stringSize =
$"{size.X.ToString(CultureInfo.InvariantCulture)},{size.Y.ToString(CultureInfo.InvariantCulture)}";
switch (UIManager.ActiveScreen)
{
case DefaultGameScreen _:
_config.SetCVar(CCVars.DefaultScreenChatSize, stringSize);
//White modification start
_config.SetCVar(WhiteCVars.DefaultChatSize, size.ConvertToString(';'));
//End
break;
case SeparatedChatGameScreen _:
_config.SetCVar(CCVars.SeparatedScreenChatSize, stringSize);
//White modification start
_config.SetCVar(WhiteCVars.SeparatedChatSize, size.ConvertToString(';'));
//End
break;
default:
// do nothing

12
Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
View File

@@ -7,13 +7,13 @@
HorizontalExpand="True"
VerticalExpand="True"
MinSize="465 225">
<PanelContainer HorizontalExpand="True" VerticalExpand="True">
<PanelContainer.PanelOverride>
<graphics:StyleBoxFlat BackgroundColor="#25252AAA" />
</PanelContainer.PanelOverride>
<PanelContainer HorizontalExpand="True" VerticalExpand="True" StyleClasses="FuckyWuckyBackground" >
<BoxContainer Orientation="Vertical" SeparationOverride="4" HorizontalExpand="True" VerticalExpand="True">
<OutputPanel Name="Contents" HorizontalExpand="True" VerticalExpand="True" Margin="8 8 8 4" />
<OutputPanel Name="Contents" HorizontalExpand="True" VerticalExpand="True" Margin="2 2 2 2" >
<OutputPanel.StyleBoxOverride>
<graphics:StyleBoxFlat PaddingRight="16" />
</OutputPanel.StyleBoxOverride>
</OutputPanel>
<controls:ChatInputBox HorizontalExpand="True" Name="ChatInput" Access="Public" Margin="2"/>
</BoxContainer>
</PanelContainer>

2
Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
View File

@@ -11,7 +11,7 @@
Orientation="Horizontal"
HorizontalAlignment="Stretch"
VerticalAlignment="Top"
SeparationOverride="5"
SeparationOverride="0"
>
<ui:MenuButton
Name="EscapeButton"

2
Content.Client/Wires/UI/WiresMenu.cs
View File

@@ -201,7 +201,7 @@ namespace Content.Client.Wires.UI
var middle = new PanelContainer
{
PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#202025")},
PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#3C4841")},
Children =
{
new BoxContainer