1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 15:07:44 +08:00

Merge pull request #26 from peppy/general-fixes

Bring framework up-to-date.
This commit is contained in:
Thomas Müller 2016-09-11 10:33:06 +02:00 committed by GitHub
commit b52c3074ef
2 changed files with 4 additions and 2 deletions

@ -1 +1 @@
Subproject commit 342214329f60e73b8e458232390dcb2488e2149f Subproject commit 0b60779e350bb5c316a5fb0454989ea831001087

View File

@ -17,7 +17,7 @@ using osu.Framework.Threading;
namespace osu.Game.Graphics.UserInterface namespace osu.Game.Graphics.UserInterface
{ {
internal class TextBox : MaskingContainer internal class TextBox : ProcessingContainer
{ {
private FlowContainer textFlow; private FlowContainer textFlow;
private Box background; private Box background;
@ -50,6 +50,8 @@ namespace osu.Game.Graphics.UserInterface
{ {
base.Load(); base.Load();
AddProcessing(new MaskingContainer());
Add(background = new Box() Add(background = new Box()
{ {
Colour = BackgroundUnfocused, Colour = BackgroundUnfocused,