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

Textbox -> TextBox rename pass

Browse Source
This commit is contained in:
Bartłomiej Dach 2020-02-13 21:04:53 +01:00
parent 5646083ed9
commit 0f25864fae
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
View File

@ -135,7 +135,7 @@ namespace osu.Game.Tests.Visual.UserInterface
protected override string FooterText => @"Footer text. And it is pretty long. Cool."; protected override string FooterText => @"Footer text. And it is pretty long. Cool.";
protected override string CommitButtonText => @"Commit"; protected override string CommitButtonText => @"Commit";
protected override string TextboxPlaceholderText => @"This text box is empty"; protected override string TextBoxPlaceholder => @"This text box is empty";
} }
private class TestCancellableCommentEditor : CancellableCommentEditor private class TestCancellableCommentEditor : CancellableCommentEditor
@ -151,7 +151,7 @@ namespace osu.Game.Tests.Visual.UserInterface
} }
protected override string CommitButtonText => @"Save"; protected override string CommitButtonText => @"Save";
protected override string TextboxPlaceholderText => @"Multiline textboxes soon"; protected override string TextBoxPlaceholder => @"Multiline textboxes soon";
} }
} }
} }

14
osu.Game/Overlays/Comments/CommentEditor.cs
View File

@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Comments
protected abstract string CommitButtonText { get; } protected abstract string CommitButtonText { get; }
protected abstract string TextboxPlaceholderText { get; } protected abstract string TextBoxPlaceholder { get; }
protected FillFlowContainer ButtonsContainer; protected FillFlowContainer ButtonsContainer;
@ -45,7 +45,7 @@ namespace osu.Game.Overlays.Comments
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider) private void load(OverlayColourProvider colourProvider)
{ {
EditorTextbox textbox; EditorTextBox textBox;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
@ -68,11 +68,11 @@ namespace osu.Game.Overlays.Comments
Direction = FillDirection.Vertical, Direction = FillDirection.Vertical,
Children = new Drawable[] Children = new Drawable[]
{ {
textbox = new EditorTextbox textBox = new EditorTextBox
{ {
Height = 40, Height = 40,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
PlaceholderText = TextboxPlaceholderText, PlaceholderText = TextBoxPlaceholder,
Current = Current Current = Current
}, },
new Container new Container
@ -115,7 +115,7 @@ namespace osu.Game.Overlays.Comments
} }
}); });
textbox.OnCommit += (u, v) => textBox.OnCommit += (u, v) =>
{ {
if (commitButton.IsBlocked.Value) if (commitButton.IsBlocked.Value)
return; return;
@ -131,7 +131,7 @@ namespace osu.Game.Overlays.Comments
Current.BindValueChanged(text => commitButton.IsBlocked.Value = string.IsNullOrEmpty(text.NewValue), true); Current.BindValueChanged(text => commitButton.IsBlocked.Value = string.IsNullOrEmpty(text.NewValue), true);
} }
private class EditorTextbox : BasicTextBox private class EditorTextBox : BasicTextBox
{ {
protected override float LeftRightPadding => side_padding; protected override float LeftRightPadding => side_padding;
@ -139,7 +139,7 @@ namespace osu.Game.Overlays.Comments
private OsuSpriteText placeholder; private OsuSpriteText placeholder;
public EditorTextbox() public EditorTextBox()
{ {
Masking = false; Masking = false;
TextContainer.Height = 0.4f; TextContainer.Height = 0.4f;