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

Merge pull request #22950 from Joehuu/fix-initial-playlist-highlight

Browse Source 
Fix now playing playlist not highlighting selected item on initial open
This commit is contained in:
Dean Herbert 2023-05-02 15:36:34 +09:00 committed by GitHub
commit ce4a6c38a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ namespace osu.Game.Overlays.Music
var artist = new RomanisableString(metadata.ArtistUnicode, metadata.Artist); var artist = new RomanisableString(metadata.ArtistUnicode, metadata.Artist);
titlePart = text.AddText(title, sprite => sprite.Font = OsuFont.GetFont(weight: FontWeight.Regular)); titlePart = text.AddText(title, sprite => sprite.Font = OsuFont.GetFont(weight: FontWeight.Regular));
titlePart.DrawablePartsRecreated += _ => updateSelectionState(true); titlePart.DrawablePartsRecreated += _ => updateSelectionState(SelectedSet.Value, applyImmediately: true);
text.AddText(@" "); // to separate the title from the artist. text.AddText(@" "); // to separate the title from the artist.
text.AddText(artist, sprite => text.AddText(artist, sprite =>
@ -66,27 +66,25 @@ namespace osu.Game.Overlays.Music
sprite.Padding = new MarginPadding { Top = 1 }; sprite.Padding = new MarginPadding { Top = 1 };
}); });
SelectedSet.BindValueChanged(set => SelectedSet.BindValueChanged(set => updateSelectionState(set.NewValue));
{ updateSelectionState(SelectedSet.Value, applyImmediately: true);
bool newSelected = set.NewValue?.Equals(Model) == true;
if (newSelected == selected)
return;
selected = newSelected;
updateSelectionState(false);
});
updateSelectionState(true);
}); });
} }
private bool selected; private bool selected;
private void updateSelectionState(bool instant) private void updateSelectionState(Live<BeatmapSetInfo> selectedSet, bool applyImmediately = false)
{ {
bool wasSelected = selected;
selected = selectedSet?.Equals(Model) == true;
// Immediate updates should forcibly set correct state regardless of previous state.
// This ensures that the initial state is correctly applied.
if (wasSelected == selected && !applyImmediately)
return;
foreach (Drawable s in titlePart.Drawables) foreach (Drawable s in titlePart.Drawables)
s.FadeColour(selected ? colours.Yellow : Color4.White, instant ? 0 : FADE_DURATION); s.FadeColour(selected ? colours.Yellow : Color4.White, applyImmediately ? 0 : FADE_DURATION);
} }
protected override Drawable CreateContent() => new DelayedLoadWrapper(text = new OsuTextFlowContainer protected override Drawable CreateContent() => new DelayedLoadWrapper(text = new OsuTextFlowContainer