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

Tidy up escape handling

Browse Source
This commit is contained in:
Dean Herbert
2018-06-27 16:06:26 +09:00
parent 8cf1553fd5
commit 6a80a21078
7 changed files with 37 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Graphics/UserInterface/FocusedTextBox.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK.Graphics;
using OpenTK.Input;
using osu.Framework.Input;
using System;
@ -26,6 +25,7 @@ namespace osu.Game.Graphics.UserInterface
{
focus = value;
if (!focus && HasFocus)
//todo: replace with KillInput after ppy/osu-framework#1656 is merged.
GetContainingInputManager().ChangeFocus(null);
}
}
@ -39,18 +39,10 @@ namespace osu.Game.Graphics.UserInterface
BorderThickness = 0;
}
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
protected override void KillFocus()
{
if (!args.Repeat && args.Key == Key.Escape)
{
if (Text.Length > 0)
Text = string.Empty;
else
Exit?.Invoke();
return true;
}
return base.OnKeyDown(state, args);
base.KillFocus();
Exit?.Invoke();
}
public override bool RequestsFocus => HoldFocus;

25
osu.Game/Graphics/UserInterface/OsuTextBox.cs
View File

@ -9,10 +9,12 @@ using osu.Framework.Input;
using osu.Game.Graphics.Sprites;
using OpenTK.Graphics;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Input.Bindings;
using osu.Game.Input.Bindings;
namespace osu.Game.Graphics.UserInterface
{
public class OsuTextBox : TextBox
public class OsuTextBox : TextBox, IKeyBindingHandler<GlobalAction>
{
protected override Color4 BackgroundUnfocused => Color4.Black.Opacity(0.5f);
protected override Color4 BackgroundFocused => OsuColour.Gray(0.3f).Opacity(0.8f);
@ -33,10 +35,7 @@ namespace osu.Game.Graphics.UserInterface
TextContainer.Height = 0.5f;
CornerRadius = 5;
Current.DisabledChanged += disabled =>
{
Alpha = disabled ? 0.3f : 1;
};
Current.DisabledChanged += disabled => { Alpha = disabled ? 0.3f : 1; };
}
[BackgroundDependencyLoader]
@ -59,5 +58,21 @@ namespace osu.Game.Graphics.UserInterface
}
protected override Drawable GetDrawableCharacter(char c) => new OsuSpriteText { Text = c.ToString(), TextSize = CalculatedTextSize };
public bool OnPressed(GlobalAction action)
{
if (action == GlobalAction.Back)
{
if (Text.Length > 0)
Text = string.Empty;
else
KillFocus();
return true;
}
return true;
}
public bool OnReleased(GlobalAction action) => false;
}
}

2
osu.Game/Graphics/UserInterface/SearchTextBox.cs
View File

@ -34,7 +34,7 @@ namespace osu.Game.Graphics.UserInterface
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
{
if (HandlePendingText(state)) return true;
if (HandlePendingText(state)) return false;
if (!state.Keyboard.ControlPressed && !state.Keyboard.ShiftPressed)
{