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

Renaming and smaller optimizations

Browse Source
This commit is contained in:
MrTheMake
2017-06-21 16:46:30 +02:00
parent 8b07565025
commit 3b2df5fa0f
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Overlays/MusicController.cs
View File

@ -209,7 +209,7 @@ namespace osu.Game.Overlays
playlist.StateChanged += (c, s) => playlist.StateChanged += (c, s) =>
{ {
if (!beatmapBacking.Disabled) if (playlistButton.Enabled)
playlistButton.FadeColour(s == Visibility.Visible ? playlistButtonColor : Color4.White, 200, EasingTypes.OutQuint); playlistButton.FadeColour(s == Visibility.Visible ? playlistButtonColor : Color4.White, 200, EasingTypes.OutQuint);
}; };
} }
@ -217,30 +217,28 @@ namespace osu.Game.Overlays
protected override void LoadComplete() protected override void LoadComplete()
{ {
beatmapBacking.ValueChanged += beatmapChanged; beatmapBacking.ValueChanged += beatmapChanged;
beatmapBacking.TriggerChange();
beatmapBacking.DisabledChanged += beatmapDisabledChanged; beatmapBacking.DisabledChanged += beatmapDisabledChanged;
beatmapDisabledChanged(beatmapBacking.Disabled); beatmapBacking.TriggerChange();
base.LoadComplete(); base.LoadComplete();
} }
private void beatmapDisabledChanged(bool newBeatmapDisabled) private void beatmapDisabledChanged(bool newBeatmapBackingDisabled)
{ {
prevButton.Enabled.Value = !newBeatmapDisabled; prevButton.Enabled.Value = !newBeatmapBackingDisabled;
nextButton.Enabled.Value = !newBeatmapDisabled; nextButton.Enabled.Value = !newBeatmapBackingDisabled;
playlistButton.Enabled.Value = !newBeatmapDisabled; playlistButton.Enabled.Value = !newBeatmapBackingDisabled;
// Toggle the playlist's visibility if required // Toggle the playlist's visibility if required
if (newBeatmapDisabled) if (newBeatmapBackingDisabled)
{ {
showPlaylistOnceAvailable = playlist.State == Visibility.Visible; showPlaylistOnceAvailable = playlist.State == Visibility.Visible;
if (showPlaylistOnceAvailable) if (showPlaylistOnceAvailable)
playlist?.Hide(); playlist.Hide();
} }
else if (showPlaylistOnceAvailable && State == Visibility.Visible) else if (showPlaylistOnceAvailable && State == Visibility.Visible)
playlist?.Show(); playlist.Show();
} }
protected override void UpdateAfterChildren() protected override void UpdateAfterChildren()