From dde748b8c1fbc1f3cdc339384585d45ffdd816f8 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Sat, 3 Sep 2016 21:18:07 +0930 Subject: [PATCH 1/3] Fix loaded not being set on textbox Load. --- osu.Game/Graphics/UserInterface/TextBox.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/osu.Game/Graphics/UserInterface/TextBox.cs b/osu.Game/Graphics/UserInterface/TextBox.cs index 8fd07f84cc..af2bd06184 100644 --- a/osu.Game/Graphics/UserInterface/TextBox.cs +++ b/osu.Game/Graphics/UserInterface/TextBox.cs @@ -48,6 +48,8 @@ namespace osu.Game.Graphics.UserInterface public override void Load() { + base.Load(); + Add(background = new Box() { Colour = BackgroundUnfocused, @@ -96,6 +98,8 @@ namespace osu.Game.Graphics.UserInterface protected override void UpdateLayout() { + base.UpdateLayout(); + //have to run this after children flow cursorAndLayout.Refresh(delegate { From ffccaacfc4d9efe4104350625f536c82dbd15117 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Sat, 3 Sep 2016 21:19:05 +0930 Subject: [PATCH 2/3] Submodule ref. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 768dd5dd7d..e33e9158a9 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 768dd5dd7d89c680d4089f43df8c7a9fc1f8688c +Subproject commit e33e9158a96f0dd72f5c6d94b3778d28e98598da From 59a69ca59c7a8b92aec4a88fa724f23614de84d3 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Sat, 3 Sep 2016 23:02:55 +0930 Subject: [PATCH 3/3] Remove unused System.Drawing reference. --- osu.Game/OsuGame.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index effc01e122..c72fb00bb0 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; -using System.Drawing; using osu.Framework.Framework; using osu.Game.Configuration; using osu.Game.GameModes.Menu;