sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Variant 4: cannot change history, empty text/everything selected resets index (current with bug fix)

Browse Source
This commit is contained in:
Terochi
2022-11-21 10:11:26 +01:00
parent 58288275a6
commit 7dc7729ac2
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game.Tests/Visual/UserInterface/TestSceneHistoryTextBox.cs
View File

@ -3,6 +3,7 @@
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Input;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
@ -101,7 +102,13 @@ namespace osu.Game.Tests.Visual.UserInterface
AddStep("Remove text", () => box.Text = string.Empty); AddStep("Remove text", () => box.Text = string.Empty);
AddStep("Move Up", () => InputManager.Key(Key.Up)); AddStep("Move Up", () => InputManager.Key(Key.Up));
AddAssert("Text unchanged", () => box.Text == string.Empty); AddAssert("Same as previous message", () => box.Text == "Message 2");
AddStep("Move Up", () => InputManager.Key(Key.Up));
AddStep("Select text", () => InputManager.Keys(PlatformAction.SelectAll));
AddStep("Replace text", () => box.Text = "New text");
AddStep("Move Up", () => InputManager.Key(Key.Up));
AddAssert("Same as previous message", () => box.Text == "Message 2");
} }
private void addMessages(int count) private void addMessages(int count)

28
osu.Game/Graphics/UserInterface/HistoryTextBox.cs
View File

@ -22,6 +22,7 @@ namespace osu.Game.Graphics.UserInterface
private int selectedIndex; private int selectedIndex;
private string originalMessage = string.Empty; private string originalMessage = string.Empty;
private bool everythingSelected;
/// <summary> /// <summary>
/// Creates a new <see cref="HistoryTextBox"/>. /// Creates a new <see cref="HistoryTextBox"/>.
@ -33,6 +34,29 @@ namespace osu.Game.Graphics.UserInterface
public HistoryTextBox(int capacity = 100) public HistoryTextBox(int capacity = 100)
{ {
messageHistory = new LimitedCapacityQueue<string>(capacity); messageHistory = new LimitedCapacityQueue<string>(capacity);
Current.ValueChanged += text =>
{
if (string.IsNullOrEmpty(text.NewValue) || everythingSelected)
{
selectedIndex = HistoryCount;
everythingSelected = false;
}
};
}
protected override void OnTextDeselected()
{
base.OnTextDeselected();
everythingSelected = false;
}
protected override void OnTextSelectionChanged(TextSelectionType selectionType)
{
base.OnTextSelectionChanged(selectionType);
everythingSelected = SelectedText == Text;
} }
protected override bool OnKeyDown(KeyDownEvent e) protected override bool OnKeyDown(KeyDownEvent e)
@ -43,6 +67,8 @@ namespace osu.Game.Graphics.UserInterface
if (selectedIndex == 0) if (selectedIndex == 0)
return true; return true;
everythingSelected = false;
if (selectedIndex == HistoryCount) if (selectedIndex == HistoryCount)
originalMessage = Text; originalMessage = Text;
@ -54,6 +80,8 @@ namespace osu.Game.Graphics.UserInterface
if (selectedIndex == HistoryCount) if (selectedIndex == HistoryCount)
return true; return true;
everythingSelected = false;
if (selectedIndex == HistoryCount - 1) if (selectedIndex == HistoryCount - 1)
{ {
selectedIndex = HistoryCount; selectedIndex = HistoryCount;