Skip to content

Fix toggling optional rule groups #1089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jasonpanosso wants to merge 1 commit into
base: dev-1.5.4
Choose a base branch
from
Open

Fix toggling optional rule groups #1089

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/electron.renderer/ui/modal/panel/EditAllAutoLayerRules.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,18 +745,6 @@ class EditAllAutoLayerRules extends ui.modal.Panel {
});

if( rg.isOptional )
ctx.addActionElement({
label: L.t._("Turn into an OPTIONAL group"),
subText: L.t._("An optional group is disabled everywhere by default, and can be enabled manually only in some specific levels."),
iconId: "optional",
cb: ()->{
invalidateRuleGroup(rg);
rg.isOptional = true;
rg.active = true; // just some cleanup
editor.ge.emit( LayerRuleGroupChanged(rg) );
},
});
else
ctx.addActionElement({
label: L.t._("Disable OPTIONAL state"),
cb: ()->{
Expand All @@ -772,6 +760,18 @@ class EditAllAutoLayerRules extends ui.modal.Panel {
);
},
});
else
ctx.addActionElement({
label: L.t._("Turn into an OPTIONAL group"),
subText: L.t._("An optional group is disabled everywhere by default, and can be enabled manually only in some specific levels."),
iconId: "optional",
cb: ()->{
invalidateRuleGroup(rg);
rg.isOptional = true;
rg.active = true; // just some cleanup
editor.ge.emit( LayerRuleGroupChanged(rg) );
},
});
});

// Wizard mode explanation
Expand Down