mirror of https://github.com/ppy/osu
Merge pull request #79 from peppy/general-fixes
Update framework version.
This commit is contained in:
commit
6597b09a55
|
@ -1 +1 @@
|
||||||
Subproject commit 30ff0e1a99a10e735611bb3ffa35352061f52d8a
|
Subproject commit 3629521379bea5d79cd41e35ad6c6dfe21b4f9e7
|
|
@ -97,7 +97,6 @@ public override void Load(BaseGame game)
|
||||||
OnHome = delegate { MainMenu?.MakeCurrent(); },
|
OnHome = delegate { MainMenu?.MakeCurrent(); },
|
||||||
OnSettings = Options.ToggleVisibility,
|
OnSettings = Options.ToggleVisibility,
|
||||||
OnPlayModeChange = delegate (PlayMode m) { PlayMode.Value = m; },
|
OnPlayModeChange = delegate (PlayMode m) { PlayMode.Value = m; },
|
||||||
Alpha = 0.001f,
|
|
||||||
},
|
},
|
||||||
Chat = new ChatConsole(API),
|
Chat = new ChatConsole(API),
|
||||||
new VolumeControl
|
new VolumeControl
|
||||||
|
@ -112,12 +111,6 @@ public override void Load(BaseGame game)
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
Toolbar.State = Visibility.Hidden;
|
|
||||||
Toolbar.Flush();
|
|
||||||
|
|
||||||
Chat.State = Visibility.Hidden;
|
|
||||||
Chat.Flush();
|
|
||||||
|
|
||||||
intro.ModePushed += modeAdded;
|
intro.ModePushed += modeAdded;
|
||||||
intro.Exited += modeRemoved;
|
intro.Exited += modeRemoved;
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,20 @@
|
||||||
|
|
||||||
namespace osu.Game.Overlays
|
namespace osu.Game.Overlays
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// An element which starts hidden and can be toggled to visible.
|
||||||
|
/// </summary>
|
||||||
public abstract class Overlay : Container, IStateful<Visibility>
|
public abstract class Overlay : Container, IStateful<Visibility>
|
||||||
{
|
{
|
||||||
|
public override void Load(BaseGame game)
|
||||||
|
{
|
||||||
|
base.Load(game);
|
||||||
|
|
||||||
|
//TODO: init code using Alpha or IsVisible override to ensure we don't call Load on children before we first get unhidden.
|
||||||
|
PopOut();
|
||||||
|
Flush();
|
||||||
|
}
|
||||||
|
|
||||||
private Visibility state;
|
private Visibility state;
|
||||||
public Visibility State
|
public Visibility State
|
||||||
{
|
{
|
||||||
|
@ -30,9 +42,9 @@ public Visibility State
|
||||||
|
|
||||||
protected abstract void PopOut();
|
protected abstract void PopOut();
|
||||||
|
|
||||||
public void ToggleVisibility()
|
public void ToggleVisibility() => State = (State == Visibility.Visible ? Visibility.Hidden : Visibility.Visible);
|
||||||
=> State = (State == Visibility.Visible ? Visibility.Hidden : Visibility.Visible);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum Visibility
|
public enum Visibility
|
||||||
{
|
{
|
||||||
Hidden,
|
Hidden,
|
||||||
|
|
Loading…
Reference in New Issue