h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 17:47:29 +08:00
Code Issues Releases Wiki Activity

Merge pull request #432 from DrabWeb/mod-overlay-cleanup

Browse Source 
Minor mod overlay cleanups
This commit is contained in:
Dean Herbert 2017-03-04 12:43:35 +09:00 committed by GitHub
commit 7dce1fbe3a
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Overlays/Mods/ModSelectOverlay.cs
View File

@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Mods
private FillFlowContainer<ModSection> modSectionsContainer;
public Bindable<Mod[]> SelectedMods = new Bindable<Mod[]>();
public readonly Bindable<Mod[]> SelectedMods = new Bindable<Mod[]>();
public readonly Bindable<PlayMode> PlayMode = new Bindable<PlayMode>();
@ -95,8 +95,6 @@ namespace osu.Game.Overlays.Mods
section.ButtonsContainer.MoveToX(100f, APPEAR_DURATION, EasingTypes.InSine);
section.ButtonsContainer.FadeOut(APPEAR_DURATION, EasingTypes.InSine);
}
TriggerFocusLost();
}
protected override void PopIn()
@ -112,8 +110,6 @@ namespace osu.Game.Overlays.Mods
section.ButtonsContainer.MoveToX(0, button_duration, EasingTypes.OutQuint);
section.ButtonsContainer.FadeIn(button_duration, EasingTypes.OutQuint);
}
Schedule(TriggerFocusContention);
}
public void DeselectAll()

12
osu.Game/Overlays/WaveOverlayContainer.cs
View File

@ -123,19 +123,13 @@ namespace osu.Game.Overlays
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.White.Opacity(50),
},
},
});
}
protected override void PopIn()
{
base.PopIn();
foreach (var w in wavesContainer.Children)
w.State = Visibility.Visible;
@ -145,6 +139,8 @@ namespace osu.Game.Overlays
protected override void PopOut()
{
base.PopOut();
contentContainer.FadeOut(DISAPPEAR_DURATION, EasingTypes.In);
contentContainer.MoveToY(DrawHeight * 2f, DISAPPEAR_DURATION, EasingTypes.In);