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

Revert "Remove PopoverButton class"

Browse Source 
This reverts commit 6b712be97d.
This commit is contained in:
Dan Balasescu 2022-03-24 11:15:51 +09:00
parent 34a367b369
commit 547418e47e
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
View File

@ -79,7 +79,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
ClickButtonWhenEnabled<CountdownButton>(); ClickButtonWhenEnabled<CountdownButton>();
AddStep("click the first countdown button", () => AddStep("click the first countdown button", () =>
{ {
var popoverButton = this.ChildrenOfType<CountdownButton>().Single().ChildrenOfType<OsuButton>().First(); var popoverButton = this.ChildrenOfType<CountdownButton.PopoverButton>().First();
InputManager.MoveMouseTo(popoverButton); InputManager.MoveMouseTo(popoverButton);
InputManager.Click(MouseButton.Left); InputManager.Click(MouseButton.Left);
}); });
@ -97,7 +97,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
ClickButtonWhenEnabled<CountdownButton>(); ClickButtonWhenEnabled<CountdownButton>();
AddStep("click the first countdown button", () => AddStep("click the first countdown button", () =>
{ {
var popoverButton = this.ChildrenOfType<CountdownButton>().Single().ChildrenOfType<OsuButton>().First(); var popoverButton = this.ChildrenOfType<CountdownButton.PopoverButton>().First();
InputManager.MoveMouseTo(popoverButton); InputManager.MoveMouseTo(popoverButton);
InputManager.Click(MouseButton.Left); InputManager.Click(MouseButton.Left);
}); });
@ -150,7 +150,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
ClickButtonWhenEnabled<CountdownButton>(); ClickButtonWhenEnabled<CountdownButton>();
AddStep("click the first countdown button", () => AddStep("click the first countdown button", () =>
{ {
var popoverButton = this.ChildrenOfType<CountdownButton>().Single().ChildrenOfType<OsuButton>().First(); var popoverButton = this.ChildrenOfType<CountdownButton.PopoverButton>().First();
InputManager.MoveMouseTo(popoverButton); InputManager.MoveMouseTo(popoverButton);
InputManager.Click(MouseButton.Left); InputManager.Click(MouseButton.Left);
}); });
@ -173,7 +173,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
ClickButtonWhenEnabled<CountdownButton>(); ClickButtonWhenEnabled<CountdownButton>();
AddStep("click the first countdown button", () => AddStep("click the first countdown button", () =>
{ {
var popoverButton = this.ChildrenOfType<CountdownButton>().Single().ChildrenOfType<OsuButton>().First(); var popoverButton = this.ChildrenOfType<CountdownButton.PopoverButton>().First();
InputManager.MoveMouseTo(popoverButton); InputManager.MoveMouseTo(popoverButton);
InputManager.Click(MouseButton.Left); InputManager.Click(MouseButton.Left);
}); });

6
osu.Game/Screens/OnlinePlay/Multiplayer/Match/CountdownButton.cs
View File

@ -64,7 +64,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
foreach (var duration in available_delays) foreach (var duration in available_delays)
{ {
flow.Add(new OsuButton flow.Add(new PopoverButton
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Text = $"Start match in {duration.Humanize()}", Text = $"Start match in {duration.Humanize()}",
@ -79,5 +79,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
return new OsuPopover { Child = flow }; return new OsuPopover { Child = flow };
} }
public class PopoverButton : OsuButton
{
}
} }
} }