h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-05 02:43:16 +08:00
Code Issues Releases Wiki Activity

Merge pull request #722 from DrabWeb/playlist-commit

Browse Source 
Play first visible set in playlist on commit
This commit is contained in:
Dean Herbert 2017-05-12 20:53:13 +09:00 committed by GitHub
commit 08f980ccae
5 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,8 @@ namespace osu.Game.Graphics.UserInterface
/// </summary> /// </summary>
public class SearchTextBox : FocusedTextBox public class SearchTextBox : FocusedTextBox
{ {
protected virtual bool AllowCommit => false;
public SearchTextBox() public SearchTextBox()
{ {
Height = 35; Height = 35;
@ -43,8 +45,10 @@ namespace osu.Game.Graphics.UserInterface
case Key.Right: case Key.Right:
case Key.Up: case Key.Up:
case Key.Down: case Key.Down:
case Key.Enter:
return false; return false;
case Key.Enter:
if (!AllowCommit) return false;
break;
} }
} }

1
osu.Game/Overlays/Music/FilterControl.cs
View File

@ -61,6 +61,7 @@ namespace osu.Game.Overlays.Music
protected override Color4 BackgroundUnfocused => backgroundColour; protected override Color4 BackgroundUnfocused => backgroundColour;
protected override Color4 BackgroundFocused => backgroundColour; protected override Color4 BackgroundFocused => backgroundColour;
protected override bool AllowCommit => true;
public FilterTextBox() public FilterTextBox()
{ {

4
osu.Game/Overlays/Music/PlaylistItem.cs
View File

@ -132,6 +132,10 @@ namespace osu.Game.Overlays.Music
FadeTo(matching ? 1 : 0, 200); FadeTo(matching ? 1 : 0, 200);
} }
get
{
return matching;
}
} }
} }
} }

2
osu.Game/Overlays/Music/PlaylistList.cs
View File

@ -22,6 +22,8 @@ namespace osu.Game.Overlays.Music
} }
} }
public BeatmapSetInfo FirstVisibleSet => items.Children.FirstOrDefault(i => i.MatchingCurrentFilter)?.BeatmapSetInfo;
private void itemSelected(BeatmapSetInfo b) private void itemSelected(BeatmapSetInfo b)
{ {
OnSelect?.Invoke(b); OnSelect?.Invoke(b);

5
osu.Game/Overlays/Music/PlaylistOverlay.cs
View File

@ -84,6 +84,11 @@ namespace osu.Game.Overlays.Music
list.BeatmapSets = BeatmapSets = beatmaps.GetAllWithChildren<BeatmapSetInfo>().ToList(); list.BeatmapSets = BeatmapSets = beatmaps.GetAllWithChildren<BeatmapSetInfo>().ToList();
beatmapBacking.BindTo(game.Beatmap); beatmapBacking.BindTo(game.Beatmap);
filter.Search.OnCommit = (sender, newText) => {
var beatmap = list.FirstVisibleSet?.Beatmaps?.FirstOrDefault();
if (beatmap != null) playSpecified(beatmap);
};
} }
protected override void LoadComplete() protected override void LoadComplete()