Skip to content

Commit dc2473f

Browse files
authored
Merge pull request #223 from menvae/lfade-mask
Allow Fading any Layer in Layer Fade for any Playfield/Subfield
2 parents 9a95deb + f5b51b2 commit dc2473f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

fluXis/Screens/Edit/Tabs/Design/Points/Entries/LayerFadeEntry.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected override Drawable[] CreateValueContent()
3333
{
3434
var str = $"{fade.Layer.ToString()} {(fade.Alpha * 100).ToStringInvariant()}% {(int)fade.Duration}ms";
3535

36-
if (fade.Layer == LayerFadeEvent.FadeLayer.Playfield)
36+
if (fade.Layer != LayerFadeEvent.FadeLayer.HUD)
3737
str += $" P{fade.PlayfieldIndex}S{fade.PlayfieldSubIndex}";
3838

3939
return new FluXisSpriteText
@@ -45,7 +45,7 @@ protected override Drawable[] CreateValueContent()
4545

4646
protected override IEnumerable<Drawable> CreateSettings()
4747
{
48-
var layerPlayfield = new BindableBool(fade.Layer == LayerFadeEvent.FadeLayer.Playfield);
48+
var isNotHUD = new BindableBool(fade.Layer != LayerFadeEvent.FadeLayer.HUD);
4949

5050
return base.CreateSettings().Concat(new Drawable[]
5151
{
@@ -73,7 +73,7 @@ protected override IEnumerable<Drawable> CreateSettings()
7373
OnValueChanged = value =>
7474
{
7575
fade.Layer = value;
76-
layerPlayfield.Value = value == LayerFadeEvent.FadeLayer.Playfield;
76+
isNotHUD.Value = value != LayerFadeEvent.FadeLayer.HUD;
7777
Map.Update(fade);
7878
}
7979
},
@@ -85,7 +85,7 @@ protected override IEnumerable<Drawable> CreateSettings()
8585
Min = 0,
8686
Max = Map.MapInfo.IsDual ? 2 : 0,
8787
Step = 1,
88-
Enabled = layerPlayfield,
88+
Enabled = isNotHUD,
8989
HideWhenDisabled = true,
9090
OnValueChanged = value =>
9191
{
@@ -101,7 +101,7 @@ protected override IEnumerable<Drawable> CreateSettings()
101101
Min = 0,
102102
Max = Map.MapInfo.ExtraPlayfields + 1,
103103
Step = 1,
104-
Enabled = layerPlayfield,
104+
Enabled = isNotHUD,
105105
HideWhenDisabled = true,
106106
OnValueChanged = value =>
107107
{

0 commit comments

Comments
 (0)