DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
Merge feat/ime: IME composition (#322)
aiongg23b6ce4cc197
diff --cc crates/engine/src/cmd/edit.rsindex ecb04f001,b553620c7..cd2d11c39--- a/crates/engine/src/cmd/edit.rs+++ b/crates/engine/src/cmd/edit.rs@@@ -107,22 -107,18 +107,22 @@@ pub fn specs() -> Vec<CommandSpec>let st = s.doc_mut()?;let e = st.history.undo.pop().ok_or_else(|| super::bad("edit.undo", "nothing to undo"))?;st.history.redo.push(HistoryEntry { label: e.label.clone(), doc: st.doc.clone(), selection: st.selection.clone() });- st.doc = e.doc;+ let mut doc = e.doc;+ super::rulers::keep_zero_point(&st.doc, &mut doc);+ st.doc = doc;st.selection = e.selection;- st.revision += 1;+ st.bump_revision();Ok(json!({"undone": e.label}))}),cmd!(noundo "edit.redo", "Redo", ["Edit"], Some("Cmd+Shift+Z"), "{}", can_redo, |s, _| {let st = s.doc_mut()?;let e = st.history.redo.pop().ok_or_else(|| super::bad("edit.redo", "nothing to redo"))?;st.history.undo.push(HistoryEntry { label: e.label.clone(), doc: st.doc.clone(), selection: st.selection.clone() });- st.doc = e.doc;+ let mut doc = e.doc;+ super::rulers::keep_zero_point(&st.doc, &mut doc);+ st.doc = doc;st.selection = e.selection;- st.revision += 1;+ st.bump_revision();Ok(json!({"redone": e.label}))}),cmd!(noundo "selection.set", "Select", [], None, "{ids: [id], add?: bool, content?: bool}", has_doc, |s, p| {diff --cc crates/ui-egui/src/lib.rsindex 117171b9d,de48d792c..0d852f1ab--- a/crates/ui-egui/src/lib.rs+++ b/crates/ui-egui/src/lib.rs@@@ -1183,45 -1201,6 +1241,52 @@@ pub fn drop_key_name_text(raw: &mut egumod tests {use super::*;+ /// The Control panel's two-row groups were centred as if they were one row tall, so the second+ /// row hung below the panel and was cut off.+ #[test]+ fn control_bar_shows_its_second_row() {+ let mut app = DesignApp::new(designcraft_engine::Session::new(), Services::default());+ app.run("file.newSample", json!({})).unwrap();+ app.ui.control_bar = true;+ let mut h = egui_kittest::Harness::builder().with_size(egui::vec2(1440.0, 900.0)).build_ui_state(+ |ui, app: &mut DesignApp| {+ let ctx = ui.ctx().clone();+ app.logic(&ctx);+ app.ui(ui);+ },+ app,+ );+ h.run_steps(4);+ let bar = egui::containers::panel::PanelState::load(&h.ctx, egui::Id::new("control_bar")).unwrap().outer_rect;+ assert!(bar.height() > 40.0, "{bar:?}");+ // The X/Y/W/H group: its second row holds Y: and H:.+ let group = h.ctx.read_response(egui::Id::new(("object_control", "dimensions"))).unwrap().rect;+ assert!(bar.contains(group.left_top()), "the X/Y/W/H group {group:?} is in the Control panel {bar:?}");+ assert!(group.bottom() <= bar.bottom(), "X/Y/W/H group {group:?} hangs below the Control panel {bar:?}");+ }++ #[test]+ fn key_names_sent_as_text_are_dropped() {+ let text = |t: &str| egui::Event::Text(t.to_string());+ let events = || {+ vec![text("AltGraph"), text("é"), text("Dead"), text("A"), text("Unidentified"), text("ß"), text("AudioVolumeUp"), text("ab"), text("Æ")]+ };+ let mut raw = egui::RawInput { events: events(), ..Default::default() };+ drop_key_name_text(&mut raw, false);+ assert_eq!(raw.events, vec![text("é"), text("A"), text("ß"), text("ab"), text("Æ")]);- // A focused text field gets its text from input events, which can be whole words.++ assert!(is_key_name("F13") && is_key_name("Escape") && is_key_name("ZoomToggle") && !is_key_name("F") && !is_key_name("Fx"));++ // Capitalised words (mobile autocompletion) are text.++ let words = vec![text("Hello"), text("Tokyo"), text("OK"), text("Hi there")];++ let mut raw = egui::RawInput { events: words.clone(), ..Default::default() };++ drop_key_name_text(&mut raw, false);++ assert_eq!(raw.events, words);++ // A focused text field or a canvas text caret gets its text from the browser's input++ // events, which hold whole words, key-name-like ones too ("Help").+ let mut raw = egui::RawInput { events: events(), ..Default::default() };+ drop_key_name_text(&mut raw, true);+ assert_eq!(raw.events, events());+ }+/// An app with one document that has an unsaved edit.fn app_with_unsaved_document() -> DesignApp {let mut app = DesignApp::new(designcraft_engine::Session::new(), Services::default());diff --cc crates/ui-egui/src/menus.rsindex fdf098e71,b9c4439d9..a22bd7910--- a/crates/ui-egui/src/menus.rs+++ b/crates/ui-egui/src/menus.rs@@@ -1851,8 -1801,11 +1865,11 @@@ pub fn checked(app: &DesignApp, id: &st/// Enablement for menu display (UI commands need a document unless they're app/window-level).pub fn menu_enabled(app: &DesignApp, id: &str) -> bool {+ if waits_for_ime(app, id) {+ return false;+ }if ui_label(id).is_some() {- return app.session.active().is_some() || id.starts_with("app.") || id.starts_with("window.");+ return app.session.active().is_some() || id.starts_with("app.") || id.starts_with("window.") || id.starts_with("help.");}enabled(app, id)}