From fd9db21ad7ba6fb630bc45c4133f787c31135e8f Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Thu, 21 Feb 2019 18:13:37 +0100
Subject: [PATCH] Update submodule.

---
 Content.Client/GameTicking/ClientGameTicker.cs |  4 ++--
 Content.Client/UserInterface/NanoStyle.cs      | 13 +++++++++----
 engine                                         |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Content.Client/GameTicking/ClientGameTicker.cs b/Content.Client/GameTicking/ClientGameTicker.cs
index f0da2d47eb..2bd512374e 100644
--- a/Content.Client/GameTicking/ClientGameTicker.cs
+++ b/Content.Client/GameTicking/ClientGameTicker.cs
@@ -153,7 +153,7 @@ namespace Content.Client.GameTicking
             _lobby.ServerName.Text = _baseClient.GameInfo.ServerName;
 
             _inputManager.SetInputCommand(EngineKeyFunctions.FocusChat,
-                InputCmdHandler.FromDelegate(session => { _lobby.Chat.Input.GrabFocus(); }));
+                InputCmdHandler.FromDelegate(session => { _lobby.Chat.Input.GrabKeyboardFocus(); }));
 
             _updateLobbyUi();
 
@@ -200,7 +200,7 @@ namespace Content.Client.GameTicking
             }
 
             _inputManager.SetInputCommand(EngineKeyFunctions.FocusChat,
-                InputCmdHandler.FromDelegate(session => { _gameChat.Input.GrabFocus(); }));
+                InputCmdHandler.FromDelegate(session => { _gameChat.Input.GrabKeyboardFocus(); }));
 
             _gameChat = new Chatbox();
             _userInterfaceManager.StateRoot.AddChild(_gameChat);
diff --git a/Content.Client/UserInterface/NanoStyle.cs b/Content.Client/UserInterface/NanoStyle.cs
index 3d7c80f088..08e97963e6 100644
--- a/Content.Client/UserInterface/NanoStyle.cs
+++ b/Content.Client/UserInterface/NanoStyle.cs
@@ -14,9 +14,6 @@ namespace Content.Client.UserInterface
     {
         private static readonly Color NanoGold = Color.FromHex("#A88B5E");
 
-        private static readonly StyleBox WindowBackground = new StyleBoxFlat
-            {BackgroundColor = Color.FromHex("#25252A")};
-
         public Stylesheet Stylesheet { get; }
 
         public NanoStyle()
@@ -36,6 +33,14 @@ namespace Content.Client.UserInterface
                 PatchMarginBottom = 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 buttonNormal = new StyleBoxTexture
             {
@@ -92,7 +97,7 @@ namespace Content.Client.UserInterface
                     new SelectorElement(null, new[] {SS14Window.StyleClassWindowPanel}, null, null),
                     new[]
                     {
-                        new StyleProperty(Panel.StylePropertyPanel, WindowBackground),
+                        new StyleProperty(Panel.StylePropertyPanel, windowBackground),
                     }),
                 // Window header.
                 new StyleRule(
diff --git a/engine b/engine
index 9c7adb7248..b3e3066c53 160000
--- a/engine
+++ b/engine
@@ -1 +1 @@
-Subproject commit 9c7adb7248867e5bd3f3aba017bdadbcd48ec2d2
+Subproject commit b3e3066c53a22ec4d656861d461a4337d22cf268