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

Merge remote-tracking branch 'upstream/master' into user-status-wiring

Browse Source
This commit is contained in:
Dean Herbert
2019-06-12 16:00:35 +09:00
parent bb8a77d27d f23e812318
commit a9c229b1ec
75 changed files with 271 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Select/BeatmapDetails.cs
View File

@ -360,13 +360,13 @@ namespace osu.Game.Screens.Select
protected override void PopIn()
{
this.FadeIn(transition_duration, Easing.OutQuint);
loading.State = Visibility.Visible;
loading.Show();
}
protected override void PopOut()
{
this.FadeOut(transition_duration, Easing.OutQuint);
loading.State = Visibility.Hidden;
loading.Hide();
}
}
}

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

@ -100,7 +100,7 @@ namespace osu.Game.Screens.Select
{
void removeOldInfo()
{
State = beatmap == null ? Visibility.Hidden : Visibility.Visible;
State.Value = beatmap == null ? Visibility.Hidden : Visibility.Visible;
Info?.FadeOut(250);
Info?.Expire();

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

@ -278,7 +278,7 @@ namespace osu.Game.Screens.Select
protected virtual void ExitFromBack()
{
if (ModSelect.State == Visibility.Visible)
if (ModSelect.State.Value == Visibility.Visible)
{
ModSelect.Hide();
return;
@ -520,7 +520,7 @@ namespace osu.Game.Screens.Select
if (base.OnExiting(next))
return true;
beatmapInfoWedge.State = Visibility.Hidden;
beatmapInfoWedge.Hide();
this.FadeOut(100);