h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 09:47:52 +08:00
Code Issues Releases Wiki Activity

Prevent updating bind target when hovering cancel and clear buttons instead

Browse Source
This commit is contained in:
Joehu 2020-08-02 12:52:12 -07:00
parent d49e54deb6
commit 7aafc018ad
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
View File

@ -48,7 +48,7 @@ namespace osu.Game.Overlays.KeyBinding
public bool FilteringActive { get; set; } public bool FilteringActive { get; set; }
private OsuSpriteText text; private OsuSpriteText text;
private Drawable pressAKey; private FillFlowContainer cancelAndClearButtons;
public FillFlowContainer<KeyButton> Buttons; public FillFlowContainer<KeyButton> Buttons;
@ -80,7 +80,7 @@ namespace osu.Game.Overlays.KeyBinding
Hollow = true, Hollow = true,
}; };
Children = new[] Children = new Drawable[]
{ {
new Box new Box
{ {
@ -99,7 +99,7 @@ namespace osu.Game.Overlays.KeyBinding
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight Origin = Anchor.TopRight
}, },
pressAKey = new FillFlowContainer cancelAndClearButtons = new FillFlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Padding = new MarginPadding(padding) { Top = height + padding * 2 }, Padding = new MarginPadding(padding) { Top = height + padding * 2 },
@ -187,7 +187,8 @@ namespace osu.Game.Overlays.KeyBinding
if (bindTarget.IsHovered) if (bindTarget.IsHovered)
finalise(); finalise();
else if (Buttons.Any(b => b.IsHovered)) // prevent updating bind target before clear button's action
else if (!cancelAndClearButtons.Any(b => b.IsHovered))
updateBindTarget(); updateBindTarget();
} }
@ -298,8 +299,8 @@ namespace osu.Game.Overlays.KeyBinding
if (HasFocus) if (HasFocus)
GetContainingInputManager().ChangeFocus(null); GetContainingInputManager().ChangeFocus(null);
pressAKey.FadeOut(300, Easing.OutQuint); cancelAndClearButtons.FadeOut(300, Easing.OutQuint);
pressAKey.BypassAutoSizeAxes |= Axes.Y; cancelAndClearButtons.BypassAutoSizeAxes |= Axes.Y;
} }
protected override void OnFocus(FocusEvent e) protected override void OnFocus(FocusEvent e)
@ -307,8 +308,8 @@ namespace osu.Game.Overlays.KeyBinding
AutoSizeDuration = 500; AutoSizeDuration = 500;
AutoSizeEasing = Easing.OutQuint; AutoSizeEasing = Easing.OutQuint;
pressAKey.FadeIn(300, Easing.OutQuint); cancelAndClearButtons.FadeIn(300, Easing.OutQuint);
pressAKey.BypassAutoSizeAxes &= ~Axes.Y; cancelAndClearButtons.BypassAutoSizeAxes &= ~Axes.Y;
updateBindTarget(); updateBindTarget();
base.OnFocus(e); base.OnFocus(e);