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

Merge branch 'master' into fix-disabled-set-crash

Browse Source
This commit is contained in:
Dan Balasescu
2019-03-05 17:25:13 +09:00
committed by GitHub
parent 56697339b3 a676eed2f9
commit fd147dae21
372 changed files with 3325 additions and 1072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,12 +50,14 @@ namespace osu.Game.Overlays.Music
}
private bool selected;
public bool Selected
{
get { return selected; }
get => selected;
set
{
if (value == selected) return;
selected = value;
FinishTransforms(true);
@ -142,7 +144,7 @@ namespace osu.Game.Overlays.Music
public bool MatchingFilter
{
get { return matching; }
get => matching;
set
{
if (matching == value) return;

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

@ -34,8 +34,8 @@ namespace osu.Game.Overlays.Music
public new MarginPadding Padding
{
get { return base.Padding; }
set { base.Padding = value; }
get => base.Padding;
set => base.Padding = value;
}
public BeatmapSetInfo FirstVisibleSet => items.FirstVisibleSet;
@ -109,8 +109,8 @@ namespace osu.Game.Overlays.Music
public string SearchTerm
{
get { return search.SearchTerm; }
set { search.SearchTerm = value; }
get => search.SearchTerm;
set => search.SearchTerm = value;
}
public BeatmapSetInfo FirstVisibleSet => items.FirstOrDefault(i => i.MatchingFilter)?.BeatmapSetInfo;
@ -130,6 +130,7 @@ namespace osu.Game.Overlays.Music
nativeDragPosition = e.ScreenSpaceMousePosition;
if (draggedItem == null)
return base.OnDrag(e);
return true;
}