mirror of
https://github.com/storytold/designcraft.git
synced 2026-10-26 19:26:46 -06:00
Conflicts: - crates/tools/src/lib.rs: Overlay keeps next's ContentGhost and adds LiveCornerWidget and LiveCornerDiamond. - crates/tools/src/select.rs: the module doc keeps next's threading and content paragraphs and adds the live-corner one. Drag keeps Place and adds Corner; SelectionTool holds both `loaded` and `live`. pointer() first ends live-corner editing when the selection changed, then runs next's loaded-text-cursor and double-click handling. An empty-canvas press clears `live` and keeps next's `content: false` Pending. drag() handles Place and Corner. overlays() keeps next's Place marquee and content ghost and appends the widget or diamonds. - crates/ui-egui/src/canvas.rs: the overlay pass keeps next's doc/layout for ContentGhost and next's Path drawing, and adds the two live-corner arms (the branch's no-op Path arm is dropped). The live-corner render test goes before next's fast_harness tests. - crates/engine/src/cmd/object.rs: next's text_wrap stays; the branch's corner_options function follows it. - crates/engine/src/tests.rs, crates/tools/src/tests.rs: both sides' tests kept. - ROADMAP.md: the live corners progress-log line goes first; the status line names it too. Action::Handled is matched in engine tooling.rs; no other crate matches Action or Overlay exhaustively.