h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 13:37:25 +08:00
Code Issues Releases Wiki Activity

Merge pull request #26 from peppy/general-fixes

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

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

4
osu.Game/Graphics/UserInterface/TextBox.cs
View File

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