aleleba/designcraft
1
0
Fork 0
mirror of https://github.com/storytold/designcraft.git synced 2026-11-02 14:47:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #575 (update): Effects panel: the level row, Isolate Blending and Knockout Group

Browse Source 
Conflict: crates/ui-egui/src/i18n.rs, i18n/{ar,it,ja,pt_br,uk}.rs, panels/properties.rs: rebased duplicate of the PR code next has; kept next's side and took the new pasted-into-frame fix
Conflict: ROADMAP.md: dropped the rebased duplicate progress line
This commit is contained in:
aiongg
2026-10-12 18:18:10 +00:00
parent e439d5d4d2 b71d469b79
commit ade7db75cb
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/panels/properties.rs
+27 -1
View File
@@ -2241,7 +2241,7 @@ pub fn effects_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
}
});
// The level the settings apply to, with its blend mode and opacity ("Group: Color Dodge 100%").
let group = matches!(it.content, designcraft_doc::Content::Group { .. });
let group = it.is_group();
ui.horizontal(|ui| {
let level = crate::i18n::tr(&app.ui.language, if group { "Group:" } else { "Object:" });
crate::rtl::label(ui, egui::RichText::new(level).font(crate::theme::semibold(12.0)));
@@ -2700,4 +2700,30 @@ mod effects_panel_tests {
click(&mut app, &ctx, "Knockout Group");
assert!(!item(&app, a).knockout);
}
#[test]
fn pasted_into_frames_keep_object_level_and_disable_group_blending() {
let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
app.run("file.new", json!({})).unwrap();
let child = app.run("frame.create", json!({"rect": [80, 80, 120, 120]})).unwrap()["id"].clone();
app.run("selection.set", json!({"ids": [child]})).unwrap();
app.run("edit.copy", json!({})).unwrap();
let container = app.run("frame.create", json!({"rect": [72, 72, 200, 200]})).unwrap()["id"].as_u64().unwrap();
app.run("selection.set", json!({"ids": [container]})).unwrap();
app.run("edit.pasteInto", json!({})).unwrap();
app.run("selection.set", json!({"ids": [container]})).unwrap();
let ctx = egui::Context::default();
crate::theme::install_fonts(&ctx, "en");
crate::theme::apply(&ctx, &Tokens::for_brightness(crate::theme::Brightness::default()));
let texts: Vec<String> = frame(&mut app, &ctx, vec![]).into_iter().map(|(t, _)| t).collect();
assert!(texts.iter().any(|t| t == "Object:"), "a frame remains an object after Paste Into: {texts:?}");
let undo = app.session.doc().unwrap().history.undo.len();
click(&mut app, &ctx, "Isolate Blending");
click(&mut app, &ctx, "Knockout Group");
let st = app.session.doc().unwrap();
let it = st.doc.item(designcraft_doc::ItemId(container)).unwrap();
assert!(it.has_nested_items());
assert!(!it.isolate && !it.knockout, "group-only options stay disabled for a frame holding content");
assert_eq!(st.history.undo.len(), undo, "disabled controls do not create undo steps");
}
}