sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-04-29 10:47:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move ctor content to Load(). Schedule some prop updates.

Browse Source
This commit is contained in:
Dean Herbert 2016-08-29 16:22:45 +09:00
parent 7f0212f93f
commit 41c03ab255
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,12 +12,13 @@ using OpenTK.Input;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.MathUtils; using osu.Framework.MathUtils;
using osu.Framework.Threading;
namespace osu.Game.Graphics.UserInterface namespace osu.Game.Graphics.UserInterface
{ {
internal class TextBox : MaskingContainer internal class TextBox : MaskingContainer
{ {
private readonly FlowContainer textFlow; private FlowContainer textFlow;
private Box background; private Box background;
protected Box cursor; protected Box cursor;
protected Container TextContainer; protected Container TextContainer;
@ -42,22 +43,10 @@ namespace osu.Game.Graphics.UserInterface
internal float SpaceWidth = 10; internal float SpaceWidth = 10;
float length; private Scheduler textUpdateScheduler = new Scheduler();
public TextBox(string text, float size, Vector2 pos, float length) public override void Load()
{ {
TextSize = size;
Position = pos;
this.length = length;
if (length == 0)
{
length = 1;
SizeMode = InheritMode.X;
}
Size = new Vector2(length, size);
Add(background = new Box() Add(background = new Box()
{ {
Colour = BackgroundUnfocused, Colour = BackgroundUnfocused,
@ -82,8 +71,6 @@ namespace osu.Game.Graphics.UserInterface
TextContainer.Add(cursor); TextContainer.Add(cursor);
TextContainer.Add(textFlow); TextContainer.Add(textFlow);
Text = text;
} }
private void resetSelection() private void resetSelection()
@ -112,6 +99,8 @@ namespace osu.Game.Graphics.UserInterface
//have to run this after children flow //have to run this after children flow
cursorAndLayout.Refresh(delegate cursorAndLayout.Refresh(delegate
{ {
textUpdateScheduler.Update();
Vector2 cursorPos = Vector2.Zero; Vector2 cursorPos = Vector2.Zero;
if (text.Length > 0) if (text.Length > 0)
cursorPos.X = getPositionAt(selectionLeft); cursorPos.X = getPositionAt(selectionLeft);
@ -358,15 +347,18 @@ namespace osu.Game.Graphics.UserInterface
if (value == text) if (value == text)
return; return;
int startBefore = selectionStart; textUpdateScheduler.Add(delegate
selectionStart = selectionEnd = 0; {
textFlow.Clear(); int startBefore = selectionStart;
text = string.Empty; selectionStart = selectionEnd = 0;
textFlow?.Clear();
text = string.Empty;
foreach (char c in value) foreach (char c in value)
addCharacter(c); addCharacter(c);
selectionStart = MathHelper.Clamp(startBefore, 0, text.Length); selectionStart = MathHelper.Clamp(startBefore, 0, text.Length);
}, true);
cursorAndLayout.Invalidate(); cursorAndLayout.Invalidate();
} }