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

Add test and isolate ignore bindable from EnableUserDim

Browse Source
This commit is contained in:
Dean Herbert
2019-12-17 13:21:23 +09:00
parent b5db927d93
commit f8ffa67693
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Graphics/Containers/UserDimContainer.cs
View File

@ -59,7 +59,7 @@ namespace osu.Game.Graphics.Containers
private float breakLightening => LightenDuringBreaks.Value && IsBreakTime.Value ? BREAK_LIGHTEN_AMOUNT : 0;
protected float DimLevel => Math.Max(EnableUserDim.Value ? (float)UserDimLevel.Value - breakLightening : 0, 0);
protected float DimLevel => Math.Max(EnableUserDim.Value && !IgnoreUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : 0, 0);
protected override Container<Drawable> Content => dimContent;
@ -88,7 +88,7 @@ namespace osu.Game.Graphics.Containers
ShowStoryboard.ValueChanged += _ => UpdateVisuals();
ShowVideo.ValueChanged += _ => UpdateVisuals();
StoryboardReplacesBackground.ValueChanged += _ => UpdateVisuals();
IgnoreUserSettings.ValueChanged += _ => updateSettings();
IgnoreUserSettings.ValueChanged += _ => UpdateVisuals();
}
protected override void LoadComplete()
@ -112,13 +112,5 @@ namespace osu.Game.Graphics.Containers
dimContent.FadeTo(ContentDisplayed ? 1 : 0, BACKGROUND_FADE_DURATION, Easing.OutQuint);
dimContent.FadeColour(OsuColour.Gray(1f - DimLevel), BACKGROUND_FADE_DURATION, Easing.OutQuint);
}
/// <summary>
/// Invoked when the IgnoreUserSettings bindable is changed
/// </summary>
private void updateSettings()
{
EnableUserDim.Value = !IgnoreUserSettings.Value;
}
}
}