sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-15 02:27:33 +09:00
Code Issues Packages Projects Releases Wiki Activity

expose two Bindables with split logic instead of one with mixed logic

Browse Source
This commit is contained in:
Aergwyn 2018-05-21 15:53:50 +02:00
parent 1482bca147
commit b7e3ea348b
12 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
View File

@ -16,13 +16,13 @@ namespace osu.Game.Graphics.Containers
private SampleChannel samplePopIn; private SampleChannel samplePopIn;
private SampleChannel samplePopOut; private SampleChannel samplePopOut;
protected BindableBool AllowOverlays = new BindableBool(true); private readonly BindableBool allowOpeningOverlays = new BindableBool(true);
[BackgroundDependencyLoader(true)] [BackgroundDependencyLoader(true)]
private void load(OsuGame osuGame, AudioManager audio) private void load(OsuGame osuGame, AudioManager audio)
{ {
if (osuGame != null) if (osuGame != null)
AllowOverlays.BindTo(osuGame.AllowOverlays); allowOpeningOverlays.BindTo(osuGame.AllowOpeningOverlays);
samplePopIn = audio.Sample.Get(@"UI/overlay-pop-in"); samplePopIn = audio.Sample.Get(@"UI/overlay-pop-in");
samplePopOut = audio.Sample.Get(@"UI/overlay-pop-out"); samplePopOut = audio.Sample.Get(@"UI/overlay-pop-out");
@ -52,7 +52,7 @@ namespace osu.Game.Graphics.Containers
private void onStateChanged(Visibility visibility) private void onStateChanged(Visibility visibility)
{ {
if (AllowOverlays) if (allowOpeningOverlays)
{ {
switch (visibility) switch (visibility)
{ {

9
osu.Game/OsuGame.cs
View File

@ -77,7 +77,8 @@ namespace osu.Game
public float ToolbarOffset => Toolbar.Position.Y + Toolbar.DrawHeight; public float ToolbarOffset => Toolbar.Position.Y + Toolbar.DrawHeight;
public readonly BindableBool AllowOverlays = new BindableBool(); public readonly BindableBool HideOverlaysOnEnter = new BindableBool();
public readonly BindableBool AllowOpeningOverlays = new BindableBool(true);
private OsuScreen screenStack; private OsuScreen screenStack;
@ -367,12 +368,12 @@ namespace osu.Game
settings.StateChanged += _ => updateScreenOffset(); settings.StateChanged += _ => updateScreenOffset();
notifications.StateChanged += _ => updateScreenOffset(); notifications.StateChanged += _ => updateScreenOffset();
notifications.Enabled.BindTo(AllowOverlays); notifications.Enabled.BindTo(AllowOpeningOverlays);
AllowOverlays.ValueChanged += show => HideOverlaysOnEnter.ValueChanged += hide =>
{ {
//central game screen change logic. //central game screen change logic.
if (!show) if (hide)
{ {
hideAllOverlays(); hideAllOverlays();
musicController.State = Visibility.Hidden; musicController.State = Visibility.Hidden;

2
osu.Game/Screens/Edit/Editor.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Screens.Edit
{ {
protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg4"); protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg4");
public override bool HideOverlaysOnEnter => true; protected override bool HideOverlaysOnEnter => true;
public override bool AllowBeatmapRulesetChange => false; public override bool AllowBeatmapRulesetChange => false;
private Box bottomBackground; private Box bottomBackground;

2
osu.Game/Screens/Loader.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Screens
{ {
private bool showDisclaimer; private bool showDisclaimer;
public override bool HideOverlaysOnEnter => true; protected override bool HideOverlaysOnEnter => true;
protected override bool AllowBackButton => false; protected override bool AllowBackButton => false;

13
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -27,7 +27,8 @@ namespace osu.Game.Screens.Menu
{ {
public event Action<MenuState> StateChanged; public event Action<MenuState> StateChanged;
private readonly BindableBool allowOverlays = new BindableBool(); private readonly BindableBool hideOverlaysOnEnter = new BindableBool();
private readonly BindableBool allowOpeningOverlays = new BindableBool();
public Action OnEdit; public Action OnEdit;
public Action OnExit; public Action OnExit;
@ -136,7 +137,10 @@ namespace osu.Game.Screens.Menu
private void load(AudioManager audio, OsuGame game) private void load(AudioManager audio, OsuGame game)
{ {
if (game != null) if (game != null)
allowOverlays.BindTo(game.AllowOverlays); {
hideOverlaysOnEnter.BindTo(game.HideOverlaysOnEnter);
allowOpeningOverlays.BindTo(game.AllowOpeningOverlays);
}
sampleBack = audio.Sample.Get(@"Menu/button-back-select"); sampleBack = audio.Sample.Get(@"Menu/button-back-select");
} }
@ -324,8 +328,6 @@ namespace osu.Game.Screens.Menu
logoDelayedAction = Scheduler.AddDelayed(() => logoDelayedAction = Scheduler.AddDelayed(() =>
{ {
allowOverlays.Value = false;
logo.ClearTransforms(targetMember: nameof(Position)); logo.ClearTransforms(targetMember: nameof(Position));
logo.RelativePositionAxes = Axes.Both; logo.RelativePositionAxes = Axes.Both;
@ -353,7 +355,8 @@ namespace osu.Game.Screens.Menu
logoTracking = true; logoTracking = true;
logo.Impact(); logo.Impact();
allowOverlays.Value = true; hideOverlaysOnEnter.Value = false;
allowOpeningOverlays.Value = true;
}, 200); }, 200);
break; break;
default: default:

3
osu.Game/Screens/Menu/Disclaimer.cs
View File

@ -18,7 +18,8 @@ namespace osu.Game.Screens.Menu
private readonly SpriteIcon icon; private readonly SpriteIcon icon;
private Color4 iconColour; private Color4 iconColour;
public override bool HideOverlaysOnEnter => true; protected override bool HideOverlaysOnEnter => true;
public override bool CursorVisible => false; public override bool CursorVisible => false;
public Disclaimer() public Disclaimer()

4
osu.Game/Screens/Menu/Intro.cs
View File

@ -31,7 +31,9 @@ namespace osu.Game.Screens.Menu
private SampleChannel welcome; private SampleChannel welcome;
private SampleChannel seeya; private SampleChannel seeya;
public override bool HideOverlaysOnEnter => true; protected override bool HideOverlaysOnEnter => true;
protected override bool AllowOpeningOverlays => false;
public override bool CursorVisible => false; public override bool CursorVisible => false;
protected override BackgroundScreen CreateBackground() => new BackgroundScreenEmpty(); protected override BackgroundScreen CreateBackground() => new BackgroundScreenEmpty();

3
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -24,7 +24,8 @@ namespace osu.Game.Screens.Menu
{ {
private readonly ButtonSystem buttons; private readonly ButtonSystem buttons;
public override bool HideOverlaysOnEnter => buttons.State == MenuState.Initial; protected override bool HideOverlaysOnEnter => buttons.State == MenuState.Initial;
protected override bool AllowOpeningOverlays => buttons.State != MenuState.Initial;
protected override bool AllowBackButton => buttons.State != MenuState.Initial; protected override bool AllowBackButton => buttons.State != MenuState.Initial;

17
osu.Game/Screens/OsuScreen.cs
View File

@ -32,12 +32,19 @@ namespace osu.Game.Screens
/// </summary> /// </summary>
protected virtual BackgroundScreen CreateBackground() => null; protected virtual BackgroundScreen CreateBackground() => null;
protected BindableBool AllowOverlays = new BindableBool(); private readonly BindableBool hideOverlaysOnEnter = new BindableBool();
/// <summary> /// <summary>
/// Whether overlays should be hidden when this screen is entered or resumed. /// Whether overlays should be hidden when this screen is entered or resumed.
/// </summary> /// </summary>
public virtual bool HideOverlaysOnEnter => false; protected virtual bool HideOverlaysOnEnter => hideOverlaysOnEnter;
private readonly BindableBool allowOpeningOverlays = new BindableBool();
/// <summary>
/// Whether overlays should be able to be opened while this screen is active.
/// </summary>
protected virtual bool AllowOpeningOverlays => allowOpeningOverlays;
/// <summary> /// <summary>
/// Whether this <see cref="OsuScreen"/> allows the cursor to be displayed. /// Whether this <see cref="OsuScreen"/> allows the cursor to be displayed.
@ -88,7 +95,8 @@ namespace osu.Game.Screens
if (osuGame != null) if (osuGame != null)
{ {
Ruleset.BindTo(osuGame.Ruleset); Ruleset.BindTo(osuGame.Ruleset);
AllowOverlays.BindTo(osuGame.AllowOverlays); hideOverlaysOnEnter.BindTo(osuGame.HideOverlaysOnEnter);
allowOpeningOverlays.BindTo(osuGame.AllowOpeningOverlays);
} }
sampleExit = audio.Sample.Get(@"UI/screen-back"); sampleExit = audio.Sample.Get(@"UI/screen-back");
@ -220,7 +228,8 @@ namespace osu.Game.Screens
if (backgroundParallaxContainer != null) if (backgroundParallaxContainer != null)
backgroundParallaxContainer.ParallaxAmount = ParallaxContainer.DEFAULT_PARALLAX_AMOUNT * BackgroundParallaxAmount; backgroundParallaxContainer.ParallaxAmount = ParallaxContainer.DEFAULT_PARALLAX_AMOUNT * BackgroundParallaxAmount;
AllowOverlays.Value = !HideOverlaysOnEnter; hideOverlaysOnEnter.Value = HideOverlaysOnEnter;
allowOpeningOverlays.Value = AllowOpeningOverlays;
} }
private void onExitingLogo() private void onExitingLogo()

2
osu.Game/Screens/Play/Player.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.Screens.Play
{ {
protected override float BackgroundParallaxAmount => 0.1f; protected override float BackgroundParallaxAmount => 0.1f;
public override bool HideOverlaysOnEnter => true; protected override bool HideOverlaysOnEnter => true;
public Action RestartRequested; public Action RestartRequested;

6
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -25,8 +25,8 @@ namespace osu.Game.Screens.Play
private BeatmapMetadataDisplay info; private BeatmapMetadataDisplay info;
private bool allowOverlays = true; private bool hideOverlays;
public override bool HideOverlaysOnEnter => !allowOverlays; protected override bool HideOverlaysOnEnter => hideOverlays;
private Task loadTask; private Task loadTask;
@ -36,7 +36,7 @@ namespace osu.Game.Screens.Play
player.RestartRequested = () => player.RestartRequested = () =>
{ {
allowOverlays = false; hideOverlays = true;
ValidForResume = true; ValidForResume = true;
}; };
} }

2
osu.Game/Screens/Tournament/Drawings.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Screens.Tournament
{ {
private const string results_filename = "drawings_results.txt"; private const string results_filename = "drawings_results.txt";
public override bool HideOverlaysOnEnter => true; protected override bool HideOverlaysOnEnter => true;
protected override BackgroundScreen CreateBackground() => new BackgroundScreenDefault(); protected override BackgroundScreen CreateBackground() => new BackgroundScreenDefault();