h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 18:33:20 +08:00
Code Issues Releases Wiki Activity

Expose buttons for test cases

Browse Source
This commit is contained in:
smoogipoo 2017-12-18 19:13:08 +09:00
parent 918e7c9a4b
commit a17b2e4c18
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Play/FailOverlay.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Screens.Play
{
if (!args.Repeat && args.Key == Key.Escape)
{
Buttons.Children.Last().TriggerOnClick();
InternalButtons.Children.Last().TriggerOnClick();
return true;
}

18
osu.Game/Screens/Play/GameplayMenuOverlay.cs
View File

@ -14,6 +14,7 @@ using osu.Framework.Allocation;
using osu.Game.Graphics.UserInterface;
using osu.Framework.Graphics.Shapes;
using OpenTK.Input;
using System.Collections.Generic;
namespace osu.Game.Screens.Play
{
@ -31,7 +32,8 @@ namespace osu.Game.Screens.Play
public abstract string Header { get; }
public abstract string Description { get; }
protected FillFlowContainer<DialogButton> Buttons;
protected internal FillFlowContainer<DialogButton> InternalButtons;
public IReadOnlyList<DialogButton> Buttons => InternalButtons;
private FillFlowContainer retryCounterContainer;
@ -95,7 +97,7 @@ namespace osu.Game.Screens.Play
}
}
},
Buttons = new FillFlowContainer<DialogButton>
InternalButtons = new FillFlowContainer<DialogButton>
{
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
@ -191,7 +193,7 @@ namespace osu.Game.Screens.Play
button.Selected.ValueChanged += s => buttonSelectionChanged(button, s);
Buttons.Add(button);
InternalButtons.Add(button);
}
private int _selectionIndex = -1;
@ -205,13 +207,13 @@ namespace osu.Game.Screens.Play
// Deselect the previously-selected button
if (_selectionIndex != -1)
Buttons[_selectionIndex].Selected.Value = false;
InternalButtons[_selectionIndex].Selected.Value = false;
_selectionIndex = value;
// Select the newly-selected button
if (_selectionIndex != -1)
Buttons[_selectionIndex].Selected.Value = true;
InternalButtons[_selectionIndex].Selected.Value = true;
}
}
@ -224,12 +226,12 @@ namespace osu.Game.Screens.Play
{
case Key.Up:
if (selectionIndex == -1 || selectionIndex == 0)
selectionIndex = Buttons.Count - 1;
selectionIndex = InternalButtons.Count - 1;
else
selectionIndex--;
return true;
case Key.Down:
if (selectionIndex == -1 || selectionIndex == Buttons.Count - 1)
if (selectionIndex == -1 || selectionIndex == InternalButtons.Count - 1)
selectionIndex = 0;
else
selectionIndex++;
@ -244,7 +246,7 @@ namespace osu.Game.Screens.Play
if (!isSelected)
selectionIndex = -1;
else
selectionIndex = Buttons.IndexOf(button);
selectionIndex = InternalButtons.IndexOf(button);
}
private class Button : DialogButton

2
osu.Game/Screens/Play/PauseContainer.cs
View File

@ -130,7 +130,7 @@ namespace osu.Game.Screens.Play
{
if (!args.Repeat && args.Key == Key.Escape)
{
Buttons.Children.First().TriggerOnClick();
InternalButtons.Children.First().TriggerOnClick();
return true;
}