From 4ef1be308037af1d4775b9c0d8a491d5ab2aae00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Thu, 17 Aug 2017 08:43:45 +0900 Subject: [PATCH] More localised key binding hover colour logic --- osu.Game/Overlays/KeyBinding/KeyBindingRow.cs | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs index 274619991c..44aee0e666 100644 --- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs +++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs @@ -220,13 +220,7 @@ namespace osu.Game.Overlays.KeyBinding if (value == isBinding) return; isBinding = value; - if (isBinding) - { - box.FadeColour(Color4.White, transition_time, Easing.OutQuint); - Text.FadeColour(Color4.Black, transition_time, Easing.OutQuint); - } - else - updateHoverState(); + updateHoverState(); } } @@ -278,22 +272,28 @@ namespace osu.Game.Overlays.KeyBinding protected override bool OnHover(InputState state) { - if (!isBinding) - updateHoverState(); + updateHoverState(); return base.OnHover(state); } protected override void OnHoverLost(InputState state) { - if (!isBinding) - updateHoverState(); + updateHoverState(); base.OnHoverLost(state); } private void updateHoverState() { - box.FadeColour(IsHovered ? hoverColour : Color4.Black, transition_time, Easing.OutQuint); - Text.FadeColour(IsHovered ? Color4.Black : Color4.White, transition_time, Easing.OutQuint); + if (isBinding) + { + box.FadeColour(Color4.White, transition_time, Easing.OutQuint); + Text.FadeColour(Color4.Black, transition_time, Easing.OutQuint); + } + else + { + box.FadeColour(IsHovered ? hoverColour : Color4.Black, transition_time, Easing.OutQuint); + Text.FadeColour(IsHovered ? Color4.Black : Color4.White, transition_time, Easing.OutQuint); + } } public void UpdateKeyCombination(params Key[] newCombination)