sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

let editor dim different from gameplay dim

Browse Source
This commit is contained in:
cdwcgt
2022-10-25 13:01:24 +09:00
parent f9c6190426
commit 6991195d69
4 changed files with 68 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,6 @@ using osu.Game.Screens.Edit.Timing;
using osu.Game.Screens.Edit.Verify;
using osu.Game.Screens.Play;
using osu.Game.Users;
using osuTK.Graphics;
using osuTK.Input;
using CommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings;
@ -176,7 +175,7 @@ namespace osu.Game.Screens.Edit
[Resolved(canBeNull: true)]
private OnScreenDisplay onScreenDisplay { get; set; }
private Bindable<bool> useUserDim;
private Bindable<float> editorDim;
public Editor(EditorLoader loader = null)
{
@ -262,8 +261,7 @@ namespace osu.Game.Screens.Edit
OsuMenuItem undoMenuItem;
OsuMenuItem redoMenuItem;
TernaryStateRadioMenuItem backgroundDim;
useUserDim = config.GetBindable<bool>(OsuSetting.EditorUseDim);
editorDim = config.GetBindable<float>(OsuSetting.EditorDim);
AddInternal(new OsuContextMenuContainer
{
@ -316,7 +314,7 @@ namespace osu.Game.Screens.Edit
Items = new MenuItem[]
{
new WaveformOpacityMenuItem(config.GetBindable<float>(OsuSetting.EditorWaveformOpacity)),
backgroundDim = new TernaryStateRadioMenuItem("Background Dim", MenuItemType.Standard, _ => useUserDim.Value = !useUserDim.Value),
new BackgroundDimMenuItem(editorDim),
}
}
}
@ -337,12 +335,7 @@ namespace osu.Game.Screens.Edit
changeHandler?.CanUndo.BindValueChanged(v => undoMenuItem.Action.Disabled = !v.NewValue, true);
changeHandler?.CanRedo.BindValueChanged(v => redoMenuItem.Action.Disabled = !v.NewValue, true);
useUserDim.BindValueChanged(s =>
{
dimBackground();
backgroundDim.State.Value = s.NewValue ? TernaryState.True : TernaryState.False;
});
backgroundDim.State.Value = useUserDim.Value ? TernaryState.True : TernaryState.False;
editorDim.BindValueChanged(_ => dimBackground());
}
[Resolved]
@ -638,10 +631,8 @@ namespace osu.Game.Screens.Edit
{
ApplyToBackground(b =>
{
// todo: temporary. we want to be applying dim using the UserDimContainer eventually.
if (!useUserDim.Value) b.FadeColour(Color4.DarkGray, 500);
b.IgnoreUserSettings.Value = !useUserDim.Value;
b.IgnoreUserSettings.Value = true;
b.DimAmount.Value = editorDim.Value;
b.BlurAmount.Value = 0;
});
}
@ -671,8 +662,8 @@ namespace osu.Game.Screens.Edit
ApplyToBackground(b =>
{
b.FadeColour(Color4.White, 500);
b.IgnoreUserSettings.Value = true;
//b.DimAmount.UnbindAll();
b.DimAmount.Value = 0;
});
resetTrack();