sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'update-platform-action-triggers' into multiplayer-create-with-enter

Browse Source
This commit is contained in:
Dean Herbert
2021-08-04 17:31:38 +09:00
parent 3c7a49f431 9b9dacf3fe
commit 42e14fb492
36 changed files with 55 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -210,7 +210,7 @@ namespace osu.Game.Screens.Menu
{
if (buttonsTopLevel.Any(b => e.Key == b.TriggerKey))
{
logo?.Click();
logo?.TriggerClick();
return true;
}
}
@ -226,7 +226,7 @@ namespace osu.Game.Screens.Menu
return goBack();
case GlobalAction.Select:
logo?.Click();
logo?.TriggerClick();
return true;
default:
@ -248,7 +248,7 @@ namespace osu.Game.Screens.Menu
return true;
case ButtonSystemState.Play:
backButton.Click();
backButton.TriggerClick();
return true;
default:
@ -268,11 +268,11 @@ namespace osu.Game.Screens.Menu
return true;
case ButtonSystemState.TopLevel:
buttonsTopLevel.First().Click();
buttonsTopLevel.First().TriggerClick();
return false;
case ButtonSystemState.Play:
buttonsPlay.First().Click();
buttonsPlay.First().TriggerClick();
return false;
}
}

2
osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
View File

@ -262,7 +262,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
switch (action)
{
case GlobalAction.Select:
Click();
TriggerClick();
return true;
}

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

@ -42,12 +42,12 @@ namespace osu.Game.Screens.Play
/// <summary>
/// Action that is invoked when <see cref="GlobalAction.Back"/> is triggered.
/// </summary>
protected virtual Action BackAction => () => InternalButtons.Children.LastOrDefault()?.Click();
protected virtual Action BackAction => () => InternalButtons.Children.LastOrDefault()?.TriggerClick();
/// <summary>
/// Action that is invoked when <see cref="GlobalAction.Select"/> is triggered.
/// </summary>
protected virtual Action SelectAction => () => InternalButtons.Selected?.Click();
protected virtual Action SelectAction => () => InternalButtons.Selected?.TriggerClick();
public abstract string Header { get; }

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

@ -24,7 +24,7 @@ namespace osu.Game.Screens.Play
private SkinnableSound pauseLoop;
protected override Action BackAction => () => InternalButtons.Children.First().Click();
protected override Action BackAction => () => InternalButtons.Children.First().TriggerClick();
[BackgroundDependencyLoader]
private void load(OsuColour colours)

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

@ -148,7 +148,7 @@ namespace osu.Game.Screens.Play
if (!button.Enabled.Value)
return false;
button.Click();
button.TriggerClick();
return true;
}

2
osu.Game/Screens/Select/FooterButton.cs
View File

@ -176,7 +176,7 @@ namespace osu.Game.Screens.Select
{
if (action == Hotkey)
{
Click();
TriggerClick();
return true;
}

2
osu.Game/Screens/Select/FooterButtonRandom.cs
View File

@ -67,7 +67,7 @@ namespace osu.Game.Screens.Select
return false;
}
Click();
TriggerClick();
return true;
}

2
osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
View File

@ -122,7 +122,7 @@ namespace osu.Game.Screens.Select.Options
if (found != null)
{
found.Click();
found.TriggerClick();
return true;
}
}