h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 15:53:51 +08:00
Code Issues Releases Wiki Activity

apply feedback

Browse Source 
-don't directly set AllowOverlay Bindable
this should be done specifically where needed
-remove AllowOverlay Bindable from ButtonSystem
-remove unnecessary xmldoc
This commit is contained in:
Aergwyn 2018-06-03 11:30:58 +02:00
parent 6000a90721
commit 707af02097
7 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,9 +17,6 @@ namespace osu.Game.Graphics.Containers
private SampleChannel samplePopIn;
private SampleChannel samplePopOut;
/// <summary>
/// Defaults to <see cref="OverlayActivation.All"/> so that the overlay works even if BDL couldn't pass an <see cref="OsuGame"/>.
/// </summary>
private readonly Bindable<OverlayActivation> allowOverlays = new Bindable<OverlayActivation>(OverlayActivation.All);
[BackgroundDependencyLoader(true)]

3
osu.Game/Overlays/Toolbar/Toolbar.cs
View File

@ -31,9 +31,6 @@ namespace osu.Game.Overlays.Toolbar
private const float alpha_hovering = 0.8f;
private const float alpha_normal = 0.6f;
/// <summary>
/// Defaults to <see cref="OverlayActivation.All"/> so that the overlay works even if BDL couldn't pass an <see cref="OsuGame"/>.
/// </summary>
private readonly Bindable<OverlayActivation> allowOverlays = new Bindable<OverlayActivation>(OverlayActivation.All);
public Toolbar()

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

@ -8,7 +8,6 @@ using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
@ -20,7 +19,6 @@ using osu.Game.Input.Bindings;
using OpenTK;
using OpenTK.Graphics;
using OpenTK.Input;
using osu.Game.Overlays;
namespace osu.Game.Screens.Menu
{
@ -28,8 +26,6 @@ namespace osu.Game.Screens.Menu
{
public event Action<MenuState> StateChanged;
private readonly Bindable<OverlayActivation> allowOverlays = new Bindable<OverlayActivation>();
public Action OnEdit;
public Action OnExit;
public Action OnDirect;
@ -134,11 +130,8 @@ namespace osu.Game.Screens.Menu
}
[BackgroundDependencyLoader(true)]
private void load(AudioManager audio, OsuGame game)
private void load(AudioManager audio)
{
if (game != null)
allowOverlays.BindTo(game.AllowOverlays);
sampleBack = audio.Sample.Get(@"Menu/button-back-select");
}
@ -329,7 +322,6 @@ namespace osu.Game.Screens.Menu
case MenuState.Exit:
case MenuState.Initial:
logoTracking = false;
allowOverlays.Value = OverlayActivation.Disabled;
logoDelayedAction = Scheduler.AddDelayed(() =>
{
@ -338,9 +330,6 @@ namespace osu.Game.Screens.Menu
logo.MoveTo(new Vector2(0.5f), 800, Easing.OutExpo);
logo.ScaleTo(1, 800, Easing.OutExpo);
if(state != MenuState.Exit)
allowOverlays.Value = OverlayActivation.All;
}, 150);
break;
case MenuState.TopLevel:

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

@ -20,6 +20,7 @@ namespace osu.Game.Screens.Menu
private Color4 iconColour;
protected override bool HideOverlaysOnEnter => true;
protected override OverlayActivation OverlayActivationLevel => OverlayActivation.Disabled;
public override bool CursorVisible => false;
@ -93,8 +94,6 @@ namespace osu.Game.Screens.Menu
LoadComponentAsync(intro = new Intro());
iconColour = colours.Yellow;
AllowOverlays.Value = OverlayActivation.Disabled;
}
protected override void OnEntering(Screen last)

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

@ -33,6 +33,7 @@ namespace osu.Game.Screens.Menu
private SampleChannel seeya;
protected override bool HideOverlaysOnEnter => true;
protected override OverlayActivation OverlayActivationLevel => OverlayActivation.Disabled;
public override bool CursorVisible => false;
@ -77,8 +78,6 @@ namespace osu.Game.Screens.Menu
welcome = audio.Sample.Get(@"welcome");
seeya = audio.Sample.Get(@"seeya");
AllowOverlays.Value = OverlayActivation.Disabled;
}
protected override void OnEntering(Screen last)

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

@ -10,7 +10,6 @@ using osu.Framework.Input;
using osu.Framework.Screens;
using osu.Game.Beatmaps;
using osu.Game.Graphics.Containers;
using osu.Game.Overlays;
using osu.Game.Screens.Backgrounds;
using osu.Game.Screens.Charts;
using osu.Game.Screens.Direct;
@ -80,8 +79,6 @@ namespace osu.Game.Screens.Menu
}
preloadSongSelect();
AllowOverlays.Value = OverlayActivation.Disabled;
}
private void preloadSongSelect()

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

@ -54,11 +54,12 @@ namespace osu.Game.Screens
/// </summary>
protected virtual bool HideOverlaysOnEnter => false;
private readonly Bindable<OverlayActivation> allowOverlays = new Bindable<OverlayActivation>();
/// <summary>
/// Whether overlays should be able to be opened.
/// It's bound at load which means changes at construction will potentially disappear.
/// Whether overlays should be able to be opened once this screen is entered or resumed.
/// </summary>
protected readonly Bindable<OverlayActivation> AllowOverlays = new Bindable<OverlayActivation>();
protected virtual OverlayActivation OverlayActivationLevel => OverlayActivation.All;
/// <summary>
/// Whether this <see cref="OsuScreen"/> allows the cursor to be displayed.
@ -109,7 +110,7 @@ namespace osu.Game.Screens
if (osuGame != null)
{
Ruleset.BindTo(osuGame.Ruleset);
AllowOverlays.BindTo(osuGame.AllowOverlays);
allowOverlays.BindTo(osuGame.AllowOverlays);
updateOverlayStates = () =>
{
@ -252,6 +253,8 @@ namespace osu.Game.Screens
if (backgroundParallaxContainer != null)
backgroundParallaxContainer.ParallaxAmount = ParallaxContainer.DEFAULT_PARALLAX_AMOUNT * BackgroundParallaxAmount;
allowOverlays.Value = OverlayActivationLevel;
updateOverlayStates?.Invoke();
}