sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 15:44:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Santeri Nogelainen
2020-03-28 18:14:17 +02:00
parent faa2b49be4 96e1ab775e
commit 6bde102207
97 changed files with 1673 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Select/FilterControl.cs
View File

@ -16,6 +16,7 @@ using Container = osu.Framework.Graphics.Containers.Container;
using osu.Framework.Graphics.Shapes;
using osu.Game.Configuration;
using osu.Game.Rulesets;
using osu.Framework.Input.Events;
namespace osu.Game.Screens.Select
{
@ -136,6 +137,8 @@ namespace osu.Game.Screens.Select
public void Deactivate()
{
searchTextBox.ReadOnly = true;
searchTextBox.HoldFocus = false;
if (searchTextBox.HasFocus)
GetContainingInputManager().ChangeFocus(searchTextBox);
@ -143,6 +146,7 @@ namespace osu.Game.Screens.Select
public void Activate()
{
searchTextBox.ReadOnly = false;
searchTextBox.HoldFocus = true;
}
@ -184,5 +188,9 @@ namespace osu.Game.Screens.Select
}
private void updateCriteria() => FilterChanged?.Invoke(CreateCriteria());
protected override bool OnClick(ClickEvent e) => true;
protected override bool OnHover(HoverEvent e) => true;
}
}

2
osu.Game/Screens/Select/Footer.cs
View File

@ -107,5 +107,7 @@ namespace osu.Game.Screens.Select
protected override bool OnMouseDown(MouseDownEvent e) => true;
protected override bool OnClick(ClickEvent e) => true;
protected override bool OnHover(HoverEvent e) => true;
}
}

3
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -56,6 +56,7 @@ namespace osu.Game.Screens.Select
switch (e.Key)
{
case Key.Enter:
case Key.KeypadEnter:
// this is a special hard-coded case; we can't rely on OnPressed (of SongSelect) as GlobalActionContainer is
// matching with exact modifier consideration (so Ctrl+Enter would be ignored).
FinaliseSelection();
@ -84,8 +85,6 @@ namespace osu.Game.Screens.Select
}
}
Beatmap.Value.Track.Looping = false;
SampleConfirm?.Play();
this.Push(player = new PlayerLoader(() => new Player()));

3
osu.Game/Screens/Select/SongSelect.cs
View File

@ -572,6 +572,9 @@ namespace osu.Game.Screens.Select
BeatmapOptions.Hide();
if (Beatmap.Value.Track != null)
Beatmap.Value.Track.Looping = false;
this.ScaleTo(1.1f, 250, Easing.InSine);
this.FadeOut(250);