From a6266850d60c6366666a4e0223f6e01d0183fa8a Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Wed, 23 Aug 2017 12:46:28 +0900 Subject: [PATCH] Make KeyBindingRow take a non-action enum. --- osu-framework | 2 +- osu.Game/Overlays/KeyBinding/KeyBindingRow.cs | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/osu-framework b/osu-framework index 74f644bad0..1fd9259e86 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 74f644bad039606e242d8782014d8c249a38b6a3 +Subproject commit 1fd9259e86379838dbbc43c12a2238df83800fc0 diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs index 6c697c8660..c182382d70 100644 --- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs +++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs @@ -1,7 +1,6 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; using System.Collections.Generic; using System.Linq; using osu.Framework.Allocation; @@ -22,7 +21,7 @@ namespace osu.Game.Overlays.KeyBinding { internal class KeyBindingRow : Container, IFilterable { - private readonly Enum action; + private readonly object action; private readonly IEnumerable bindings; private const float transition_time = 150; @@ -50,7 +49,7 @@ namespace osu.Game.Overlays.KeyBinding public string[] FilterTerms => new[] { text.Text }.Concat(bindings.Select(b => b.KeyCombination.ReadableString())).ToArray(); - public KeyBindingRow(Enum action, IEnumerable bindings) + public KeyBindingRow(object action, IEnumerable bindings) { this.action = action; this.bindings = bindings;