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

Rename variables

Browse Source
This commit is contained in:
Dean Herbert
2018-06-06 15:49:27 +09:00
parent 86be1bef6b
commit d1fd09ed47
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,13 +17,13 @@ namespace osu.Game.Graphics.Containers
private SampleChannel samplePopIn; private SampleChannel samplePopIn;
private SampleChannel samplePopOut; private SampleChannel samplePopOut;
private readonly Bindable<OverlayActivation> allowOverlays = new Bindable<OverlayActivation>(OverlayActivation.All); protected readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
[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); OverlayActivationMode.BindTo(osuGame.OverlayActivationMode);
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");
@ -56,7 +56,7 @@ namespace osu.Game.Graphics.Containers
switch (visibility) switch (visibility)
{ {
case Visibility.Visible: case Visibility.Visible:
if (allowOverlays != OverlayActivation.Disabled) if (OverlayActivationMode != OverlayActivation.Disabled)
samplePopIn?.Play(); samplePopIn?.Play();
else else
State = Visibility.Hidden; State = Visibility.Hidden;

2
osu.Game/OsuGame.cs
View File

@ -77,7 +77,7 @@ namespace osu.Game
public float ToolbarOffset => Toolbar.Position.Y + Toolbar.DrawHeight; public float ToolbarOffset => Toolbar.Position.Y + Toolbar.DrawHeight;
public readonly Bindable<OverlayActivation> AllowOverlays = new Bindable<OverlayActivation>(); public readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>();
private OsuScreen screenStack; private OsuScreen screenStack;

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

@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Toolbar
private void load(OsuGame osuGame) private void load(OsuGame osuGame)
{ {
if (osuGame != null) if (osuGame != null)
allowOverlays.BindTo(osuGame.AllowOverlays); allowOverlays.BindTo(osuGame.OverlayActivationMode);
StateChanged += visibility => StateChanged += visibility =>
{ {

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

@ -110,7 +110,7 @@ namespace osu.Game.Screens
if (osuGame != null) if (osuGame != null)
{ {
Ruleset.BindTo(osuGame.Ruleset); Ruleset.BindTo(osuGame.Ruleset);
allowOverlays.BindTo(osuGame.AllowOverlays); allowOverlays.BindTo(osuGame.OverlayActivationMode);
updateOverlayStates = () => updateOverlayStates = () =>
{ {