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

Update method names in line with framework changes

Browse Source
This commit is contained in:
Dean Herbert
2017-05-28 18:34:12 +09:00
parent e67a00f1f6
commit bdeaf2dbb4
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Desktop.VisualTests/Tests/TestCaseManiaPlayfield.cs
View File

@ -80,7 +80,7 @@ namespace osu.Desktop.VisualTests.Tests
private void triggerKeyDown(Column column) private void triggerKeyDown(Column column)
{ {
column.TriggerKeyDown(new InputState(), new KeyDownEventArgs column.TriggerOnKeyDown(new InputState(), new KeyDownEventArgs
{ {
Key = column.Key, Key = column.Key,
Repeat = false Repeat = false
@ -89,7 +89,7 @@ namespace osu.Desktop.VisualTests.Tests
private void triggerKeyUp(Column column) private void triggerKeyUp(Column column)
{ {
column.TriggerKeyUp(new InputState(), new KeyUpEventArgs column.TriggerOnKeyUp(new InputState(), new KeyUpEventArgs
{ {
Key = column.Key Key = column.Key
}); });

2
osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
View File

@ -74,7 +74,7 @@ namespace osu.Game.Graphics.UserInterface.Volume
return; return;
} }
volumeMeterMaster.TriggerWheel(state); volumeMeterMaster.TriggerOnWheel(state);
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]

4
osu.Game/Overlays/Dialog/PopupDialog.cs
View File

@ -71,7 +71,7 @@ namespace osu.Game.Overlays.Dialog
private void pressButtonAtIndex(int index) private void pressButtonAtIndex(int index)
{ {
if (index < Buttons.Count()) if (index < Buttons.Count())
Buttons.Skip(index).First().TriggerClick(); Buttons.Skip(index).First().TriggerOnClick();
} }
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
@ -80,7 +80,7 @@ namespace osu.Game.Overlays.Dialog
if (args.Key == Key.Enter) if (args.Key == Key.Enter)
{ {
Buttons.OfType<PopupDialogOkButton>().FirstOrDefault()?.TriggerClick(); Buttons.OfType<PopupDialogOkButton>().FirstOrDefault()?.TriggerOnClick();
return true; return true;
} }

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

@ -135,7 +135,7 @@ namespace osu.Game.Screens.Menu
switch (args.Key) switch (args.Key)
{ {
case Key.Space: case Key.Space:
osuLogo.TriggerClick(state); osuLogo.TriggerOnClick(state);
return true; return true;
case Key.Escape: case Key.Escape:
switch (State) switch (State)
@ -144,7 +144,7 @@ namespace osu.Game.Screens.Menu
State = MenuState.Initial; State = MenuState.Initial;
return true; return true;
case MenuState.Play: case MenuState.Play:
backButton.TriggerClick(); backButton.TriggerOnClick();
return true; return true;
} }
@ -178,10 +178,10 @@ namespace osu.Game.Screens.Menu
State = MenuState.TopLevel; State = MenuState.TopLevel;
return; return;
case MenuState.TopLevel: case MenuState.TopLevel:
buttonsTopLevel.First().TriggerClick(); buttonsTopLevel.First().TriggerOnClick();
return; return;
case MenuState.Play: case MenuState.Play:
buttonsPlay.First().TriggerClick(); buttonsPlay.First().TriggerOnClick();
return; return;
} }
} }

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) if (!args.Repeat && args.Key == Key.Escape)
{ {
Buttons.Children.Last().TriggerClick(); Buttons.Children.Last().TriggerOnClick();
return true; return true;
} }

8
osu.Game/Screens/Play/KeyCounterCollection.cs
View File

@ -131,13 +131,13 @@ namespace osu.Game.Screens.Play
public override bool HandleInput => true; public override bool HandleInput => true;
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) => target.Children.Any(c => c.TriggerKeyDown(state, args)); protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) => target.Children.Any(c => c.TriggerOnKeyDown(state, args));
protected override bool OnKeyUp(InputState state, KeyUpEventArgs args) => target.Children.Any(c => c.TriggerKeyUp(state, args)); protected override bool OnKeyUp(InputState state, KeyUpEventArgs args) => target.Children.Any(c => c.TriggerOnKeyUp(state, args));
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => target.Children.Any(c => c.TriggerMouseDown(state, args)); protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => target.Children.Any(c => c.TriggerOnMouseDown(state, args));
protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) => target.Children.Any(c => c.TriggerMouseUp(state, args)); protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) => target.Children.Any(c => c.TriggerOnMouseUp(state, args));
} }
} }
} }

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

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

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

@ -127,7 +127,7 @@ namespace osu.Game.Screens.Play
switch (args.Key) switch (args.Key)
{ {
case Key.Space: case Key.Space:
button.TriggerClick(); button.TriggerOnClick();
return true; return true;
} }