pauljd/vectorcraft
1
0
Fork 0
mirror of https://github.com/storytold/vectorcraft.git synced 2026-11-07 14:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Layers: Template always locks the layer in Layer Options

Browse Source 
Template sets Lock again even when Lock was set in the dialog before it,
so a template layer is always locked. Only a Dim Images set before
Template keeps its value.
This commit is contained in:
dotCooCoo
2026-11-04 14:56:41 +07:00
committed by bflatastic
parent 2ac1fa4cce
commit 4aa8a8b0c8
2 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/dialogs/layer_options.rs
+27 -25
View File
@@ -53,19 +53,17 @@ pub(super) fn note_set(d: &mut Dialog, field: &str, value: &Value) {
}
/// Turns Template on or off. A template is locked and dims its images, and turning Template off
/// unlocks it and turns Dim Images off; a Lock or Dim Images that was set in the dialog keeps its
/// value. For several rows, OK sends Lock and Dim Images only when
/// they are set in the dialog. `layer.setProps` then locks each row that becomes a template and
/// unlocks it and turns Dim Images off; a Dim Images that was set in the dialog keeps its value.
/// For several rows, OK sends Lock and Dim Images only when they are set in the dialog. `layer.setProps` then locks each row that becomes a template and
/// dims it to 50%, unless a percentage is set in the dialog, so the dialog shows 50%; it unlocks
/// each row that stops being a template and stops dimming it.
/// When Template is set back to the first row's value, Lock and Dim Images that were not set in
/// the dialog show the first row's values again.
fn set_template(d: &mut Dialog, on: bool) {
choose(d, "template", json!(on));
for key in ["locked", "dimImages"] {
if !is_set(d, key) {
d.fields.insert(key.into(), json!(on));
}
d.fields.insert("locked".into(), json!(on));
if !is_set(d, "dimImages") {
d.fields.insert("dimImages".into(), json!(on));
}
let Some(opened) = d.fields.get(OPENED).cloned() else {
return;
@@ -588,25 +586,29 @@ mod tests {
assert_eq!(p, json!({"template": false, "dimImages": 40.0, "ids": [first.0, second.0]}));
}
/// Lock and Dim Images set in the dialog stay as set when Template is set after them, so
/// `ui.dialog.set` gives the same result in either order.
/// A Dim Images set in the dialog stays as set when Template is set after it, so
/// `ui.dialog.set` gives the same result in either order. Template still locks the layers.
#[test]
fn template_keeps_lock_and_dim_images_that_were_set() {
let mut app = app();
let (first, second) = two_layers(&mut app);
set(&mut app, "locked", json!(false));
set(&mut app, "dimImages", json!(false));
set(&mut app, "template", json!(true));
let d = app.ui.dialog.as_ref().unwrap();
assert!(d.bool("template") && !d.bool("locked") && !d.bool("dimImages"));
let by_template_last = params(d).1;
assert_eq!(by_template_last, json!({"template": true, "locked": false, "dimImages": false, "ids": [first.0, second.0]}));
app.run("ui.layerOptions", json!({"ids": [first.0, second.0]})).unwrap();
draw(&mut app);
set(&mut app, "template", json!(true));
set(&mut app, "locked", json!(false));
set(&mut app, "dimImages", json!(false));
assert_eq!(params(app.ui.dialog.as_ref().unwrap()).1, by_template_last);
fn template_keeps_dim_images_that_was_set() {
for dim_first in [true, false] {
let mut app = app();
let (first, second) = two_layers(&mut app);
if dim_first {
set(&mut app, "dimImages", json!(false));
set(&mut app, "template", json!(true));
} else {
set(&mut app, "template", json!(true));
set(&mut app, "dimImages", json!(false));
}
let d = app.ui.dialog.as_ref().unwrap();
assert!(d.bool("template") && d.bool("locked") && !d.bool("dimImages"), "dim first: {dim_first}");
assert_eq!(params(d).1, json!({"template": true, "dimImages": false, "ids": [first.0, second.0]}), "dim first: {dim_first}");
super::super::confirm(&mut app).unwrap();
for id in [first, second] {
let n = layer(&app, id);
assert!(n.locked && matches!(n.kind, NodeKind::Layer { template: true, dim_images: None, .. }), "{id:?}, dim first: {dim_first}");
}
}
}
#[test]
docs/mcp.md
+1 -1
View File
@@ -2608,7 +2608,7 @@ and `layerRows`, the rows highlighted in the panel.
- **Dialogs and panel state** (control channel and the app's MCP): `ui.layerOptions {ids?}` and `ui.newLayer
{sublayer?}` open Layer Options (dialog `layerOptions`: name, color, template, locked, visible, printable, preview,
dimImages, dimPercent; OK is one undo step; `ui.dialog.set` of `template` also sets `locked` and `dimImages`, as the
checkbox does, except one that was set before it; for several `ids` the dialog shows the first row's settings, and OK sends only the fields set with a
checkbox does, except a Dim Images set before it; for several `ids` the dialog shows the first row's settings, and OK sends only the fields set with a
control or `ui.dialog.set`; Cmd/Ctrl+Alt+L runs `ui.newLayer` for a new layer), `ui.layersPanelOptions` opens Panel Options (`layersPanelOptions`:
layersOnly, locateSelected, rowSize small|medium|large|other, otherSize, thumbLayers, thumbGroups, thumbObjects), and
`ui.layersExpand {ids?, open?}` opens or closes rows as their triangles do (Alt-click: everything inside).