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

Update submodule.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2019-02-21 18:13:37 +01:00
parent 3516392f06
commit fd9db21ad7
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/GameTicking/ClientGameTicker.cs
View File

@@ -153,7 +153,7 @@ namespace Content.Client.GameTicking
_lobby.ServerName.Text = _baseClient.GameInfo.ServerName; _lobby.ServerName.Text = _baseClient.GameInfo.ServerName;
_inputManager.SetInputCommand(EngineKeyFunctions.FocusChat, _inputManager.SetInputCommand(EngineKeyFunctions.FocusChat,
InputCmdHandler.FromDelegate(session => { _lobby.Chat.Input.GrabFocus(); })); InputCmdHandler.FromDelegate(session => { _lobby.Chat.Input.GrabKeyboardFocus(); }));
_updateLobbyUi(); _updateLobbyUi();
@@ -200,7 +200,7 @@ namespace Content.Client.GameTicking
} }
_inputManager.SetInputCommand(EngineKeyFunctions.FocusChat, _inputManager.SetInputCommand(EngineKeyFunctions.FocusChat,
InputCmdHandler.FromDelegate(session => { _gameChat.Input.GrabFocus(); })); InputCmdHandler.FromDelegate(session => { _gameChat.Input.GrabKeyboardFocus(); }));
_gameChat = new Chatbox(); _gameChat = new Chatbox();
_userInterfaceManager.StateRoot.AddChild(_gameChat); _userInterfaceManager.StateRoot.AddChild(_gameChat);

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

@@ -14,9 +14,6 @@ namespace Content.Client.UserInterface
{ {
private static readonly Color NanoGold = Color.FromHex("#A88B5E"); private static readonly Color NanoGold = Color.FromHex("#A88B5E");
private static readonly StyleBox WindowBackground = new StyleBoxFlat
{BackgroundColor = Color.FromHex("#25252A")};
public Stylesheet Stylesheet { get; } public Stylesheet Stylesheet { get; }
public NanoStyle() public NanoStyle()
@@ -36,6 +33,14 @@ namespace Content.Client.UserInterface
PatchMarginBottom = 3, PatchMarginBottom = 3,
ExpandMarginBottom = 3, ExpandMarginBottom = 3,
}; };
var windowBackgroundTex = resCache.GetResource<TextureResource>("/Nano/window_background.png").Texture;
var windowBackground = new StyleBoxTexture
{
Texture = windowBackgroundTex,
};
windowBackground.SetMargin(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.GetResource<TextureResource>("/Nano/button_normal.png").Texture;
var buttonNormal = new StyleBoxTexture var buttonNormal = new StyleBoxTexture
{ {
@@ -92,7 +97,7 @@ namespace Content.Client.UserInterface
new SelectorElement(null, new[] {SS14Window.StyleClassWindowPanel}, null, null), new SelectorElement(null, new[] {SS14Window.StyleClassWindowPanel}, null, null),
new[] new[]
{ {
new StyleProperty(Panel.StylePropertyPanel, WindowBackground), new StyleProperty(Panel.StylePropertyPanel, windowBackground),
}), }),
// Window header. // Window header.
new StyleRule( new StyleRule(

2
engine

Submodule engine updated: 9c7adb7248...b3e3066c53