diff --git a/osu.Android.props b/osu.Android.props
index 171a0862a1..da7a8209a4 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,7 +52,7 @@
-
+
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index c36768baba..5bbdf9688f 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -129,9 +129,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
public bool OnPressed(PlatformAction action)
{
- switch (action.ActionMethod)
+ switch (action)
{
- case PlatformActionMethod.Delete:
+ case PlatformAction.Delete:
return DeleteSelected();
}
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index a1549dfbce..5e234bdacf 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -330,15 +330,15 @@ namespace osu.Game.Tests.Visual.Online
InputManager.ReleaseKey(Key.AltLeft);
}
- private void pressCloseDocumentKeys() => pressKeysFor(PlatformActionType.DocumentClose);
+ private void pressCloseDocumentKeys() => pressKeysFor(PlatformAction.DocumentClose);
- private void pressNewTabKeys() => pressKeysFor(PlatformActionType.TabNew);
+ private void pressNewTabKeys() => pressKeysFor(PlatformAction.TabNew);
- private void pressRestoreTabKeys() => pressKeysFor(PlatformActionType.TabRestore);
+ private void pressRestoreTabKeys() => pressKeysFor(PlatformAction.TabRestore);
- private void pressKeysFor(PlatformActionType type)
+ private void pressKeysFor(PlatformAction type)
{
- var binding = host.PlatformKeyBindings.First(b => ((PlatformAction)b.Action).ActionType == type);
+ var binding = host.PlatformKeyBindings.First(b => (PlatformAction)b.Action == type);
foreach (var k in binding.KeyCombination.Keys)
InputManager.PressKey((Key)k);
diff --git a/osu.Game/Graphics/UserInterface/SearchTextBox.cs b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
index fe92054d25..4a91741ce6 100644
--- a/osu.Game/Graphics/UserInterface/SearchTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
@@ -32,20 +32,15 @@ namespace osu.Game.Graphics.UserInterface
public override bool OnPressed(PlatformAction action)
{
- switch (action.ActionType)
+ switch (action)
{
- case PlatformActionType.LineEnd:
- case PlatformActionType.LineStart:
- return false;
-
+ case PlatformAction.MoveBackwardLine:
+ case PlatformAction.MoveForwardLine:
// Shift+delete is handled via PlatformAction on macOS. this is not so useful in the context of a SearchTextBox
// as we do not allow arrow key navigation in the first place (ie. the caret should always be at the end of text)
// Avoid handling it here to allow other components to potentially consume the shortcut.
- case PlatformActionType.CharNext:
- if (action.ActionMethod == PlatformActionMethod.Delete)
- return false;
-
- break;
+ case PlatformAction.DeleteForwardChar:
+ return false;
}
return base.OnPressed(action);
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 0aa6108815..0445c63eb4 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -374,17 +374,17 @@ namespace osu.Game.Overlays
public bool OnPressed(PlatformAction action)
{
- switch (action.ActionType)
+ switch (action)
{
- case PlatformActionType.TabNew:
+ case PlatformAction.TabNew:
ChannelTabControl.SelectChannelSelectorTab();
return true;
- case PlatformActionType.TabRestore:
+ case PlatformAction.TabRestore:
channelManager.JoinLastClosedChannel();
return true;
- case PlatformActionType.DocumentClose:
+ case PlatformAction.DocumentClose:
channelManager.LeaveChannel(channelManager.CurrentChannel.Value);
return true;
}
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 185f029d14..0432cdffc0 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -230,9 +230,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
public bool OnPressed(PlatformAction action)
{
- switch (action.ActionType)
+ switch (action)
{
- case PlatformActionType.SelectAll:
+ case PlatformAction.SelectAll:
SelectAll();
return true;
}
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 8939be925a..1d1d95890f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -139,9 +139,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
public bool OnPressed(PlatformAction action)
{
- switch (action.ActionMethod)
+ switch (action)
{
- case PlatformActionMethod.Delete:
+ case PlatformAction.Delete:
DeleteSelected();
return true;
}
diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index b56f9bee14..4a1f1196a9 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Screens.Edit.Compose
public bool OnPressed(PlatformAction action)
{
- if (action.ActionType == PlatformActionType.Copy)
+ if (action == PlatformAction.Copy)
host.GetClipboard().SetText(formatSelectionAsString());
return false;
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 71dd47b058..b6dc97a7f6 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -330,29 +330,29 @@ namespace osu.Game.Screens.Edit
public bool OnPressed(PlatformAction action)
{
- switch (action.ActionType)
+ switch (action)
{
- case PlatformActionType.Cut:
+ case PlatformAction.Cut:
Cut();
return true;
- case PlatformActionType.Copy:
+ case PlatformAction.Copy:
Copy();
return true;
- case PlatformActionType.Paste:
+ case PlatformAction.Paste:
Paste();
return true;
- case PlatformActionType.Undo:
+ case PlatformAction.Undo:
Undo();
return true;
- case PlatformActionType.Redo:
+ case PlatformAction.Redo:
Redo();
return true;
- case PlatformActionType.Save:
+ case PlatformAction.Save:
Save();
return true;
}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 152ba55e08..0e6cee8f18 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/osu.iOS.props b/osu.iOS.props
index dc15df6ea6..aa4bec06e3 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
-
+
@@ -93,7 +93,7 @@
-
+