Run the tool host in the canvas body at every caller but tool_story and PageView

Gallery mock panels, ui-bench, review story, doc examples and the test sites run
ToolHost::run on the ToolPass the canvas publishes, after the body's controls and
before the picture, which paints with .picture().
This commit is contained in:
aiongg
2026-11-16 21:37:38 +00:00
parent 1676d9d533
commit 5eefdb88a1
19 changed files with 275 additions and 164 deletions
+5 -1
View File
@@ -10,7 +10,11 @@
//! }
//! // In the app's canvas pass, while a dropper is armed:
//! let mut tool = DropperTool::new(|doc| composite_color(doc));
//! tool_host.run(ui, &canvas, &mut tool);
//! Canvas::new("Document").show(ui, |ui, body| {
//! if let Some(canvas) = tool_pass(&body.env) {
//! tool_host.run(ui, &canvas, &mut tool);
//! }
//! });
//! if let Some(color) = tool.take() {
//! requests.answer_eyedropper(key, color);
//! }
+5 -1
View File
@@ -6,7 +6,11 @@
//! EyedropperBar::new(&mut options).show(ui);
//! });
//! let mut tool = EyedropperTool::new(options, |doc, size, source| composite_color(doc, size, source)).foreground(foreground);
//! tool_host.run(ui, &canvas, &mut tool);
//! Canvas::new("Document").show(ui, |ui, body| {
//! if let Some(canvas) = tool_pass(&body.env) {
//! tool_host.run(ui, &canvas, &mut tool);
//! }
//! });
//! if let Some(pick) = tool.take() {
//! *(if pick.background { &mut background } else { &mut foreground }) = pick.color;
//! }
+6 -3
View File
@@ -11,7 +11,7 @@ use craft_color::ui::{
};
use craft_keymap::Mods;
use craft_theme::{ColorModel, HsbModel, ModelValues, Srgba};
use craft_ui::canvas::{Canvas, CanvasTool, ToolAction, ToolContext, ToolHost, ToolInput, ToolPath, ToolPointer};
use craft_ui::canvas::{Canvas, CanvasTool, ToolAction, ToolContext, ToolHost, ToolInput, ToolPath, ToolPointer, tool_pass};
use craft_ui::contract::{Bind, Show as _, ShowContainer as _};
use craft_ui::primitives::Draw;
use craft_ui::runtime::overlay::CloseReason;
@@ -301,10 +301,13 @@ fn color_hud_picks_at_an_injected_move() {
let mut fixture = Fixture::new(move |ui| {
let room = ui.available_rect_before_wrap();
let view = CanvasView::new(room, Point::new(300.0, 200.0), 1.0);
let shown = Canvas::new("Document").document(Size::new(600.0, 400.0)).view(view).show(ui, |_, _| {});
let shown = Canvas::new("Document").document(Size::new(600.0, 400.0)).view(view).show(ui, |ui, body| {
if let Some(pass) = tool_pass(&body.env) {
let _ = ToolHost::new().run(ui, &pass, &mut tool);
}
});
let id = shown.output.response.id;
shown_canvas.set(id);
let _ = ToolHost::new().run(ui, &shown.output, &mut tool);
let Some(at) = tool.open else { return };
let out = ColorHud::new("Color HUD", at, Bind::given(c.get())).start(start).held(ToolHost::in_gesture(ui.ctx(), id)).show(ui);
for event in out.events {
+12 -4
View File
@@ -139,10 +139,18 @@ impl<'a> CropInput<'a> {
/// let document = CropDocument::new(CropDocKey::new(1), Size::new(1200.0, 800.0), 300.0);
/// let input = CropInput::new(&ctx, &settings, &document);
/// let mut frame = None;
/// let canvas = Canvas::new("Document").show(ui, |ui, body| frame = Some(crop.show_frame(ui, body.rect, &input)));
/// let mut pass = crop.pass(input, frame);
/// let host = ToolHost::new().run(ui, &canvas.output, &mut pass);
/// for event in pass.finish().events {
/// let mut pass = None;
/// let mut host = None;
/// let _ = Canvas::new("Document").show(ui, |ui, body| {
/// // The canvas controls first, then the host on the canvas's pass.
/// frame = Some(crop.show_frame(ui, body.rect, &input));
/// if let Some(canvas) = tool_pass(&body.env) {
/// let mut tool = crop.pass(input, frame.take());
/// host = Some(ToolHost::new().run(ui, &canvas, &mut tool));
/// pass = Some(tool);
/// }
/// });
/// for event in pass.map(|pass| pass.finish().events).unwrap_or_default() {
/// match event {
/// CropEvent::Apply(commit) => { /* run the crop command, then */ crop.applied(true); }
/// CropEvent::Settings(next) => settings = next,
+7 -3
View File
@@ -6,13 +6,17 @@
//!
//! ```no_run
//! use craft_draw::ui::slice::{SliceCommand, SliceEvent, SliceItem, SliceOverlay, SliceTool};
//! use craft_ui::canvas::{Canvas, ToolHost, ToolPath};
//! use craft_ui::canvas::{Canvas, ToolHost, ToolPath, tool_pass};
//! use craft_ui::contract::{Show as _, ShowContainer as _};
//! # fn demo(ui: &mut egui::Ui, tool: &mut SliceTool, slices: &[SliceItem], selected: usize, locked: bool) {
//! let shown = Canvas::new("Document").show(ui, |ui, body| {
//! SliceOverlay::new("Slices", slices).selected_slice(selected).pick(true).locked(locked).show_at(ui, body.rect)
//! let output = SliceOverlay::new("Slices", slices).selected_slice(selected).pick(true).locked(locked).show_at(ui, body.rect);
//! // The host runs after the canvas controls.
//! if let Some(pass) = tool_pass(&body.env) {
//! let _ = ToolHost::new().run(ui, &pass, &mut *tool);
//! }
//! output
//! });
//! let _ = ToolHost::new().run(ui, &shown.output, tool);
//! let mut events = tool.take_events();
//! events.extend(shown.inner.map(|output| output.events).unwrap_or_default());
//! for event in events {
+9 -5
View File
@@ -6,7 +6,7 @@ use craft_draw::ui::{
AnchorDelete, AnchorTool, AnchorsShown, BezierHit, BezierOverlay, BezierTool, EditPath, EditSubpath, HandleSide, HandlesShown, Knot, KnotRef,
PathEdit, PathSelection, PathTool, SegmentMark,
};
use craft_ui::canvas::{Canvas, Guide, ToolHost};
use craft_ui::canvas::{Canvas, Guide, ToolHost, tool_pass};
use craft_ui::canvas_controls::Guides;
use craft_ui::contract::{Bind, Props as _, Show as _, ShowContainer as _};
use craft_ui::testing::{Fixture, pointer, trial};
@@ -260,23 +260,27 @@ fn harness_with(paths: Vec<EditPath>, pans: bool) -> Harness {
let canvas_id = ui.scope_id().with("document canvas");
let canvas = Canvas::new("Document").id(canvas_id).view(view).precise_cursors(st.precise);
let canvas = if st.pans { canvas.document(Size::new(4000.0, 4000.0)) } else { canvas };
let mut reply = None;
let canvas = canvas.show(ui, |ui, body| {
// The guides lie under the paths: a stack position hides the levels of the ones below it.
if !st.guides.is_empty() {
Guides::new("Guides", canvas_id, Bind::bound(&mut st.guides)).interactive(true).show_at(ui, body.rect);
}
BezierOverlay::new("Paths", Bind::bound(&mut st.paths), &selection)
let output = BezierOverlay::new("Paths", Bind::bound(&mut st.paths), &selection)
.tool(st.tool)
.handles(st.handles)
.anchors(st.anchors)
.segment_mark(st.segment_mark)
.show_at(ui, body.rect)
.show_at(ui, body.rect);
if let (Some(tool), Some(pass)) = (st.canvas_tool, tool_pass(&body.env)) {
reply = Some(ToolHost::new().run(ui, &pass, &mut AnchorTool::new(tool)));
}
output
});
if canvas.output.click_at().is_some() {
st.tool_clicks += 1;
}
if let Some(tool) = st.canvas_tool {
let reply = ToolHost::new().run(ui, &canvas.output, &mut AnchorTool::new(tool));
if let Some(reply) = reply {
st.tool_gestures += usize::from(reply.gesture.is_some());
}
if st.pans {
+11 -9
View File
@@ -5,7 +5,7 @@ use craft_behavior::CanvasView;
use craft_behavior::geometry::CropBox;
use craft_behavior::kurbo::{Point, Rect, Size};
use craft_draw::ui::crop::{CropDocKey, CropDocument, CropEvent, CropInput, CropRatio, CropSession, CropSettings, CropTool};
use craft_ui::canvas::{Canvas, NavigationOptions, Snap, ToolHost};
use craft_ui::canvas::{Canvas, NavigationOptions, Snap, ToolHost, tool_pass};
use craft_ui::contract::ShowContainer as _;
use craft_ui::runtime::access::Role;
use craft_ui::runtime::env::{Env, Units};
@@ -133,7 +133,6 @@ impl Rig {
let base = CanvasView::new(room, Point::new(200.0, 150.0), 1.0);
let view = host.view.unwrap_or(if host.turned_start { base.rotation(30.0) } else { base });
let showing = host.shown;
let input = CropInput::new(&host.ctx, &host.settings, &host.document);
// Overscroll on: the rig's canvas shows the whole document at fit, where Overscroll off holds the view, and
// image mode moves and turns the view.
let mut navigation = NavigationOptions::default();
@@ -145,15 +144,18 @@ impl Rig {
// The body and the host run as an app with a split body runs them: the body's report reaches the host's
// pass of the same frame.
let tool = &mut host.tool;
let mut frame = None;
let canvas = canvas.show(ui, |ui, body| {
if showing {
frame = Some(tool.show_frame(ui, body.rect, &input));
let (ctx, settings, document) = (&host.ctx, &host.settings, &host.document);
let mut hosted = None;
let _ = canvas.show(ui, |ui, body| {
let input = CropInput::new(ctx, settings, document);
let frame = showing.then(|| tool.show_frame(ui, body.rect, &input));
if let Some(canvas) = tool_pass(&body.env) {
let mut pass = tool.pass(input, frame);
let response = ToolHost::new().run(ui, &canvas, &mut pass);
hosted = Some((response, pass.finish().events));
}
});
let mut pass = host.tool.pass(input, frame);
let response = ToolHost::new().run(ui, &canvas.output, &mut pass);
let events = pass.finish().events;
let (response, events) = hosted.unwrap_or_default();
host.past_edge_passes += usize::from(response.past_edge.is_some());
host.snap_passes += usize::from(!response.snapped.is_empty());
if let Some(view) = response.view {
+5 -3
View File
@@ -8,7 +8,7 @@ use craft_behavior::CanvasView;
use craft_behavior::geometry::Constraint;
use craft_behavior::kurbo::{Point, Size};
use craft_draw::ui::crop::{CropDocKey, PerspectiveCropEvent, PerspectiveCropTool, PerspectiveInput, grid_lines, grid_steps, is_valid};
use craft_ui::canvas::{Canvas, ToolHost};
use craft_ui::canvas::{Canvas, ToolHost, tool_pass};
use craft_ui::contract::ShowContainer as _;
use craft_ui::runtime::access::Role;
use craft_ui::testing::{Fixture, trial};
@@ -41,11 +41,13 @@ impl Rig {
let view = CanvasView::new(room, Point::new(200.0, 150.0), 1.0);
let input = PerspectiveInput { document: active.get(), ..Default::default() };
let mut pass = tool.pass(input);
let canvas = Canvas::new("Document").document(SIZE).view(view).show(ui, |ui, body| {
let _ = Canvas::new("Document").document(SIZE).view(view).show(ui, |ui, body| {
let output = pass.show_quad(ui, body.rect);
applied.set(applied.get() || output.apply);
if let Some(canvas) = tool_pass(&body.env) {
let _ = ToolHost::new().run(ui, &canvas, &mut pass);
}
});
let _ = ToolHost::new().run(ui, &canvas.output, &mut pass);
});
fixture.settle();
Rig { fixture, tool, document, apply }
+11 -7
View File
@@ -28,7 +28,7 @@ fn segments_clip_to_the_page_and_vanish_when_the_centre_line_misses_it() {
#[trial]
fn the_open_transform_symmetry_takes_escape_and_every_press_on_the_canvas() {
use craft_draw::ui::symmetry::{SymmetryHandles, SymmetryTool, SymmetryTransform};
use craft_ui::canvas::{Canvas, ToolHost};
use craft_ui::canvas::{Canvas, ToolHost, tool_pass};
use craft_ui::contract::{Bind, Show as _, ShowContainer as _};
use craft_ui::testing::Fixture;
use std::cell::RefCell;
@@ -47,16 +47,20 @@ fn the_open_transform_symmetry_takes_escape_and_every_press_on_the_canvas() {
let mut fixture = Fixture::new(move |ui| {
let view = craft_behavior::CanvasView::new(ui.available_rect_before_wrap(), Point::new(200.0, 150.0), 1.0);
let mut preview = shown.borrow().preview();
let canvas = Canvas::new("Document")
.view(view)
.show(ui, |ui, body| SymmetryHandles::new("Symmetry", Bind::bound(&mut preview), page).session().show_at(ui, body.rect));
let mut reply = None;
let canvas = Canvas::new("Document").view(view).show(ui, |ui, body| {
let out = SymmetryHandles::new("Symmetry", Bind::bound(&mut preview), page).session().show_at(ui, body.rect);
if let Some(pass) = tool_pass(&body.env) {
let held = shown.borrow();
reply = Some(ToolHost::new().run(ui, &pass, &mut SymmetryTool::new(&held, true)));
}
out
});
if let Some(out) = canvas.inner {
out.edit.events.iter().for_each(|event| shown.borrow_mut().apply(event));
sn.borrow_mut().discarded |= out.discard;
}
let held = shown.borrow();
let reply = ToolHost::new().run(ui, &canvas.output, &mut SymmetryTool::new(&held, true));
sn.borrow_mut().ignored_presses += usize::from(reply.ignored_press.is_some());
sn.borrow_mut().ignored_presses += usize::from(reply.is_some_and(|reply| reply.ignored_press.is_some()));
});
fixture.settle().key(egui::Key::Escape, egui::Modifiers::NONE).settle();
assert!(seen.borrow().discarded, "Escape with nothing focused discards the session");
+9 -8
View File
@@ -532,7 +532,7 @@ fn a_press_in_the_move_reach_moves_the_box_and_a_handle_still_scales() {
#[trial]
fn the_session_boxs_snap_lines_reach_the_tool_host() {
use craft_draw::ui::transform::TransformTool;
use craft_ui::canvas::ToolHost;
use craft_ui::canvas::{ToolHost, tool_pass};
let session = Rc::new(RefCell::new(TransformSession::<()>::new(RECT)));
let view = Rc::new(RefCell::new(CanvasView::new(egui::Rect::NOTHING, Point::ZERO, 1.0)));
let lines = Rc::new(RefCell::new(Vec::new()));
@@ -547,17 +547,18 @@ fn the_session_boxs_snap_lines_reach_the_tool_host() {
let room = ui.available_rect_before_wrap();
let at = CanvasView::new(room, Point::new(f64::from(room.width()) / 2.0, f64::from(room.height()) / 2.0), 1.0);
*shown_view.borrow_mut() = at;
let mut response = None;
let canvas = Canvas::new("Document").view(at).snap(snap.clone()).show(ui, |ui, body| {
let session = shown_session.borrow();
TransformOverlay::new("Free Transform", &session, &settings).show_at(ui, body.rect)
let shown = TransformOverlay::new("Free Transform", &session, &settings).show_at(ui, body.rect);
if let Some(pass) = tool_pass(&body.env) {
let mut tool = TransformTool::new(&session, shown.snapped.clone());
response = Some(ToolHost::new().run(ui, &pass, &mut tool));
}
shown
});
let Some(shown) = canvas.inner else { return };
let response = {
let session = shown_session.borrow();
let mut tool = TransformTool::new(&session, shown.snapped);
ToolHost::new().run(ui, &canvas.output, &mut tool)
};
shown_lines.borrow_mut().push(response.snapped.len());
shown_lines.borrow_mut().push(response.unwrap_or_default().snapped.len());
let mut session = shown_session.borrow_mut();
for edit in shown.edits {
session.apply(edit, 0.0);
+6 -1
View File
@@ -16,7 +16,12 @@
//! let probe = DocSelection { doc: &doc }; // the app's SelectionProbe
//! self.lasso.operation(bar.operation); // the options bar's mode
//! let mut pass = self.lasso.pass(&probe);
//! let _ = ToolHost::new().run(ui, &canvas, &mut pass);
//! let _ = Canvas::new("Document").show(ui, |ui, body| {
//! // After the canvas controls, before the picture.
//! if let Some(canvas) = tool_pass(&body.env) {
//! let _ = ToolHost::new().run(ui, &canvas, &mut pass);
//! }
//! });
//! for event in self.lasso.take_events() {
//! match event {
//! SelectEvent::Commit { shape, operation } => app.run_select(shape, operation), // one undo step
+5 -5
View File
@@ -3,7 +3,7 @@
use std::sync::{Arc, Mutex};
use craft_behavior::CanvasView;
use craft_ui::canvas::{Canvas, ToolHost};
use craft_ui::canvas::{Canvas, ToolHost, tool_pass};
use craft_ui::contract::{Show as _, ShowContainer as _};
use craft_ui::testing::{Drive, Fixture, StoryData, StoryOutput, pointer, story};
use egui::Ui;
@@ -115,11 +115,11 @@ fn tool_drawing_a_rectangle(ui: &mut Ui, data: &mut StoryData) -> StoryOutput {
let annotations = samples();
let room = ui.available_rect_before_wrap();
let view = CanvasView::new(room, Point::new(f64::from(room.width()) / 2.0, f64::from(room.height()) / 2.0), 1.0);
let canvas = Canvas::new("Page").view(view).show(ui, |ui, cx| {
let _ = Canvas::new("Page").view(view).show(ui, |ui, cx| {
AnnotationOverlay::new("Annotations", &annotations, &[]).show_at(ui, cx.rect);
if let (Some(pass), Ok(mut tool)) = (tool_pass(&cx.env), shared.0.lock()) {
let _ = ToolHost::new().run(ui, &pass, &mut *tool);
}
});
if let Ok(mut tool) = shared.0.lock() {
let _ = ToolHost::new().run(ui, &canvas.output, &mut *tool);
}
StoryOutput::default()
}
+6 -3
View File
@@ -4,7 +4,7 @@ use std::cell::RefCell;
use std::rc::Rc;
use craft_review::collab::{PEOPLE_COLORS, ParticipantId};
use craft_ui::canvas::{Canvas, ToolHost};
use craft_ui::canvas::{Canvas, ToolHost, tool_pass};
use craft_ui::contract::ShowContainer as _;
use craft_ui::testing::{Fixture, trial};
@@ -49,8 +49,11 @@ fn escape_cancels_a_pending_edit_before_it_stops_following() {
}
let stopped = craft_review::ui::FollowFrame::new("Following", PEOPLE_COLORS[1], "Following Bo Chen")
.show(ui, |ui, _| {
let shown = Canvas::new("Document").view(view).show(ui, |_, _| {});
let _ = ToolHost::new().run(ui, &shown.output, &mut Editing(edit.clone()));
let _ = Canvas::new("Document").view(view).show(ui, |ui, body| {
if let Some(pass) = tool_pass(&body.env) {
let _ = ToolHost::new().run(ui, &pass, &mut Editing(edit.clone()));
}
});
})
.output
.stopped;
+7 -3
View File
@@ -12,7 +12,7 @@ use craft_behavior::kurbo::Point;
use craft_behavior::{Axis, CanvasView, ColumnKey, ColumnWidth, DisplayOrder, ItemSource, PixelSize, RulerUnits, Selection};
use craft_host::target::ShellInfo;
use craft_ui::canvas::{
Canvas, Guide, GuideKey, HandTool, NavigationOptions, PixelRect, RasterDisplay, RasterSource, RulerText, Rulers, ToolHost, pan,
Canvas, Guide, GuideKey, HandTool, NavigationOptions, PixelRect, RasterDisplay, RasterSource, RulerText, Rulers, ToolHost, pan, tool_pass,
};
use craft_ui::canvas_controls::Guides;
use craft_ui::contract::ColumnSpec;
@@ -474,12 +474,16 @@ impl Scene for CanvasViewScene {
pan(view, vec2(3.0, 2.0));
let text = RulerText::new(RulerUnits::pixels(), UnitKind::Pixels);
let canvas = ui.scope_id().with("canvas scene");
let mut hosted = None;
let shown = Canvas::new("Document").id(canvas).view(*view).rulers(text, text, *zero).show_rulers(true).show(ui, |ui, body| {
let _ = RasterDisplay::new("Picture", &SOURCE).show_at(ui, body.rect);
let _ = Guides::new("Guides", canvas, Bind::bound(&mut *guides)).show_at(ui, body.rect);
let _ = Rulers::new("Rulers", Bind::bound(&mut *zero)).show_at(ui, body.rect);
if let Some(pass) = tool_pass(&body.env) {
hosted = Some(ToolHost::new().run(ui, &pass, &mut *hand));
}
let _ = RasterDisplay::new("Picture", &SOURCE).picture().show_at(ui, body.rect);
});
if let Some(next) = ToolHost::new().run(ui, &shown.output, hand).view {
if let Some(next) = hosted.and_then(|hosted| hosted.view).or(shown.output.view) {
*view = next;
}
}
+7 -4
View File
@@ -5,7 +5,7 @@ use craft_behavior::geometry::{
};
use craft_behavior::kurbo::{Point, Rect};
use craft_behavior::{Axis, CancelReason, CanvasView, EditEvent};
use craft_ui::canvas::{Canvas, CanvasTool, CropOverlay, Snap, ToolAction, ToolContext, ToolHost, ToolPath, ToolPointer};
use craft_ui::canvas::{Canvas, CanvasTool, CropOverlay, Snap, ToolAction, ToolContext, ToolHost, ToolPath, ToolPointer, tool_pass};
use craft_ui::contract::{Bind, Show as _, ShowContainer as _};
use craft_ui::primitives::Draw;
use craft_ui::runtime::access::Role;
@@ -555,12 +555,15 @@ fn scrolling_host() -> (Fixture, Rc<Cell<Option<Vec2>>>) {
let mut fixture = Fixture::new(move |ui| {
let room = ui.available_rect_before_wrap();
let view = CanvasView::new(room, Point::new(200.0, 150.0), 1.0);
let shown = Canvas::new("Document").view(view).show(ui, |ui, body| {
let mut reply = None;
let _ = Canvas::new("Document").view(view).show(ui, |ui, body| {
let out = CropOverlay::new("Crop", Bind::bound(&mut *crop.borrow_mut())).show_at(ui, body.rect);
seen.set(out.scrolls_at);
if let Some(pass) = tool_pass(&body.env) {
reply = Some(ToolHost::new().run(ui, &pass, &mut *tool.borrow_mut()));
}
});
let reply = ToolHost::new().run(ui, &shown.output, &mut *tool.borrow_mut());
reported.set(reply.past_edge);
reported.set(reply.unwrap_or_default().past_edge);
});
fixture.settle();
(fixture, past_edge)
+88 -42
View File
@@ -214,9 +214,14 @@ fn scroll_canvas<T: CanvasTool + 'static>(tool: Rc<RefCell<T>>, rotation: f64) -
start.rotation = rotation;
start
});
let shown = Canvas::new("Document").document(DOCUMENT).view(current).show_at(ui, room.shrink(40.0), |_, _| {});
let reply = ToolHost::new().run(ui, &shown.output, &mut *tool.borrow_mut());
let mut next = reply.view.unwrap_or(current);
let mut reply = None;
let shown = Canvas::new("Document").document(DOCUMENT).view(current).show_at(ui, room.shrink(40.0), |ui, body| {
if let Some(pass) = tool_pass(&body.env) {
reply = Some(ToolHost::new().run(ui, &pass, &mut *tool.borrow_mut()));
}
});
let reply = reply.unwrap_or_default();
let mut next = reply.view.or(shown.output.view).unwrap_or(current);
if let Some(step) = reply.scroll
&& Autoscroll::scroll(&mut next, step, DOCUMENT).is_some()
{
@@ -344,7 +349,16 @@ fn crowded_canvas(crowd: Crowd) -> CanvasRig<Rect> {
(area, None)
};
shown_canvas.set(first);
let shown = Canvas::new("Document").document(DOCUMENT).view(current).show_at(ui, first, |_, _| {});
let mut reply = None;
let shown = Canvas::new("Document").document(DOCUMENT).view(current).show_at(ui, first, |ui, body| {
if let Some(pass) = tool_pass(&body.env) {
let mut host = ToolHost::new();
if crowd == Crowd::MomentaryHand {
host = host.momentary(&mut momentary);
}
reply = Some(host.run(ui, &pass, &mut tool));
}
});
if let Some(second) = second {
Canvas::new("Other").document(DOCUMENT).view(CanvasView::new(second, Point::new(600.0, 450.0), 4.0)).show_at(ui, second, |_, _| {});
}
@@ -354,12 +368,8 @@ fn crowded_canvas(crowd: Crowd) -> CanvasRig<Rect> {
Text::new("Modal").show(ui);
});
}
let mut host = ToolHost::new();
if crowd == Crowd::MomentaryHand {
host = host.momentary(&mut momentary);
}
let reply = host.run(ui, &shown.output, &mut tool);
let mut next = reply.view.unwrap_or(current);
let reply = reply.unwrap_or_default();
let mut next = reply.view.or(shown.output.view).unwrap_or(current);
if let Some(step) = reply.scroll
&& Autoscroll::scroll(&mut next, step, DOCUMENT).is_some()
{
@@ -556,17 +566,22 @@ impl Rig {
if let Some(snap) = &snap {
shown = shown.snap(snap.clone());
}
let shown = shown.show(ui, |_, _| {});
let mut reply = None;
let shown = shown.show(ui, |ui, body| {
if let Some(pass) = tool_pass(&body.env) {
let (mut command, mut alt) = (shown_command.borrow_mut(), shown_alt.borrow_mut());
let mut host = ToolHost::new()
.stand_in(StandInKey::Command, &mut *command)
.stand_in(StandInKey::Alt, &mut *alt)
.smart_guide_color(setup.smart_color);
if let Some(momentary) = setup.momentary.as_mut() {
host = host.momentary(momentary);
}
reply = Some(host.run(ui, &pass, &mut *shown_main.borrow_mut()));
}
});
shown_canvas.set(shown.output.response.id);
let (mut command, mut alt) = (shown_command.borrow_mut(), shown_alt.borrow_mut());
let mut host = ToolHost::new()
.stand_in(StandInKey::Command, &mut *command)
.stand_in(StandInKey::Alt, &mut *alt)
.smart_guide_color(setup.smart_color);
if let Some(momentary) = setup.momentary.as_mut() {
host = host.momentary(momentary);
}
let reply = host.run(ui, &shown.output, &mut *shown_main.borrow_mut());
let reply = reply.unwrap_or_default();
shown_contexts.borrow_mut().extend(reply.context);
shown_snapped.borrow_mut().extend(reply.snapped.iter().copied());
if setup.rerun.replace(false) && frame::discardable(ui.ctx()) {
@@ -786,9 +801,12 @@ fn an_injected_pen_reading_reaches_the_tool() {
let shown_canvas = Rc::clone(&canvas);
let mut fixture = Fixture::new(move |ui| {
let room = ui.available_rect_before_wrap();
let shown = Canvas::new("Document").document(DOCUMENT).view(CanvasView::new(room, Point::new(600.0, 450.0), 1.0)).show(ui, |_, _| {});
let shown = Canvas::new("Document").document(DOCUMENT).view(CanvasView::new(room, Point::new(600.0, 450.0), 1.0)).show(ui, |ui, body| {
if let Some(pass) = tool_pass(&body.env) {
let _ = ToolHost::new().run(ui, &pass, &mut *shown_probe.borrow_mut());
}
});
shown_canvas.set(shown.output.response.id);
let _ = ToolHost::new().run(ui, &shown.output, &mut *shown_probe.borrow_mut());
});
fixture.settle();
let at = fixture.by_role(Role::CANVAS)[0].rect.center();
@@ -853,9 +871,12 @@ fn a_stroke_runs_no_settled_panel_beside_the_canvas_and_one_pass_per_move() {
});
in_region(ui, document, |ui| {
let view = CanvasView::new(document, Point::new(600.0, 450.0), 1.0);
let shown = Canvas::new("Document").document(DOCUMENT).view(view).show(ui, |_, _| {});
let shown = Canvas::new("Document").document(DOCUMENT).view(view).show(ui, |ui, body| {
if let Some(pass) = tool_pass(&body.env) {
let _ = ToolHost::new().run(ui, &pass, &mut *shown_painter.borrow_mut());
}
});
shown_canvas.set(shown.output.response.id);
let _ = ToolHost::new().run(ui, &shown.output, &mut *shown_painter.borrow_mut());
});
});
fixture.settle();
@@ -896,10 +917,16 @@ fn momentary_canvas_with(main: Probe, mut body: impl FnMut(&mut egui::Ui, &mut c
let mut fixture = Fixture::new(move |ui| {
let room = ui.available_rect_before_wrap();
let current = shown_view.get().unwrap_or_else(|| CanvasView::new(room, Point::new(600.0, 450.0), 4.0));
let shown = Canvas::new("Document").document(DOCUMENT).view(current).show(ui, &mut body);
let mut reply = None;
let shown = Canvas::new("Document").document(DOCUMENT).view(current).show(ui, |ui, cx| {
body(ui, cx);
if let Some(pass) = tool_pass(&cx.env) {
reply = Some(ToolHost::new().momentary(&mut set).run(ui, &pass, &mut *main.borrow_mut()));
}
});
shown_canvas.set(shown.output.response.id);
let reply = ToolHost::new().momentary(&mut set).run(ui, &shown.output, &mut *main.borrow_mut());
shown_view.set(Some(reply.view.unwrap_or(current)));
let reply = reply.unwrap_or_default();
shown_view.set(Some(reply.view.or(shown.output.view).unwrap_or(current)));
});
fixture.settle();
(fixture, view, canvas)
@@ -1003,7 +1030,12 @@ fn kept_canvas<T: CanvasTool + 'static>(tool: Rc<RefCell<T>>) -> CanvasRig<Rect>
let mut fixture = Fixture::new(move |ui| {
let room = ui.available_rect_before_wrap();
let current = shown_view.get().unwrap_or_else(|| CanvasView::new(room, Point::new(600.0, 450.0), 1.0));
let shown = Canvas::new("Document").document(DOCUMENT).view(current).show_at(ui, room, |_, _| {});
let mut reply = None;
let shown = Canvas::new("Document").document(DOCUMENT).view(current).show_at(ui, room, |ui, body| {
if let Some(pass) = tool_pass(&body.env) {
reply = Some(ToolHost::new().run(ui, &pass, &mut *tool.borrow_mut()));
}
});
shown_rect.set(room);
let id = shown.output.response.id;
let mut open = true;
@@ -1011,8 +1043,8 @@ fn kept_canvas<T: CanvasTool + 'static>(tool: Rc<RefCell<T>>) -> CanvasRig<Rect>
cx.keep_view_open(id);
Text::new("Pick").show(ui);
});
let reply = ToolHost::new().run(ui, &shown.output, &mut *tool.borrow_mut());
shown_view.set(Some(reply.view.unwrap_or(current)));
let reply = reply.unwrap_or_default();
shown_view.set(Some(reply.view.or(shown.output.view).unwrap_or(current)));
});
fixture.settle();
(fixture, view, rect)
@@ -1203,6 +1235,7 @@ fn menu_canvas(momentary: bool, bars: bool) -> MenuRig {
let room = ui.available_rect_before_wrap();
let current = shown_view.get().unwrap_or_else(|| CanvasView::new(room, Point::new(600.0, 450.0), 4.0));
shown_rect.set(room);
let mut reply = None;
let shown = Canvas::new("Document").document(DOCUMENT).view(current).show_at(ui, room, |ui, body| {
if bars {
let mut bar_view = current;
@@ -1213,14 +1246,17 @@ fn menu_canvas(momentary: bool, bars: bool) -> MenuRig {
)
.show_at(ui, body.rect);
}
if let Some(pass) = tool_pass(&body.env) {
let mut host = ToolHost::new();
if momentary {
host = host.momentary(&mut set);
}
reply = Some(host.run(ui, &pass, &mut hand));
}
});
let mut host = ToolHost::new();
if momentary {
host = host.momentary(&mut set);
}
let reply = host.run(ui, &shown.output, &mut hand);
let reply = reply.unwrap_or_default();
shown_contexts.borrow_mut().extend(reply.context);
shown_view.set(Some(reply.view.unwrap_or(current)));
shown_view.set(Some(reply.view.or(shown.output.view).unwrap_or(current)));
});
fixture.settle();
(fixture, contexts, view, rect)
@@ -1255,8 +1291,11 @@ fn window_reading_canvas(tool: impl CanvasTool + 'static) -> (Fixture, Rc<Cell<u
let seen = Rc::clone(&cancels);
let mut fixture = Fixture::new(move |ui| {
let room = ui.available_rect_before_wrap();
let shown = Canvas::new("Document").document(DOCUMENT).view(CanvasView::new(room, Point::new(600.0, 450.0), 1.0)).show(ui, |_, _| {});
let _ = ToolHost::new().run(ui, &shown.output, &mut *tool.borrow_mut());
let _ = Canvas::new("Document").document(DOCUMENT).view(CanvasView::new(room, Point::new(600.0, 450.0), 1.0)).show(ui, |ui, body| {
if let Some(pass) = tool_pass(&body.env) {
let _ = ToolHost::new().run(ui, &pass, &mut *tool.borrow_mut());
}
});
craft_ui::runtime::keys::with_window_intents(ui.ctx(), false, |window| {
let took = window.take(craft_behavior::Intent::Cancel);
seen.set(seen.get() + u32::from(took));
@@ -1317,10 +1356,12 @@ fn the_tool_and_the_canvas_controls_read_one_precise_cursor_from_the_canvas() {
let (tool_seen, body_seen) = (Rc::clone(&tool), Rc::clone(&body));
let mut fixture = Fixture::new(move |ui| {
let view = CanvasView::new(ui.available_rect_before_wrap(), Point::new(600.0, 450.0), 1.0);
let canvas = Canvas::new("Document").document(DOCUMENT).view(view).precise_cursors(preference).show(ui, |_, cx| {
let _ = Canvas::new("Document").document(DOCUMENT).view(view).precise_cursors(preference).show(ui, |ui, cx| {
body_seen.set(canvas_space(&cx.env).map(|space| space.precise()));
if let Some(pass) = tool_pass(&cx.env) {
let _ = ToolHost::new().run(ui, &pass, &mut PreciseProbe(Rc::clone(&tool_seen)));
}
});
let _ = ToolHost::new().run(ui, &canvas.output, &mut PreciseProbe(Rc::clone(&tool_seen)));
});
let ctx = fixture.ctx().clone();
for caps_lock in [false, true] {
@@ -1367,8 +1408,13 @@ fn readout_during_a_drag(hud: bool, shown: Option<bool>) -> (bool, bool) {
let tool = RefCell::new(Measuring { hud });
let mut fixture = Fixture::new(move |ui| {
let room = ui.available_rect_before_wrap();
let shown = Canvas::new("Document").document(DOCUMENT).view(CanvasView::new(room, Point::new(600.0, 450.0), 0.5)).show(ui, |_, _| {});
let reply = ToolHost::new().run(ui, &shown.output, &mut *tool.borrow_mut());
let mut reply = None;
let _ = Canvas::new("Document").document(DOCUMENT).view(CanvasView::new(room, Point::new(600.0, 450.0), 0.5)).show(ui, |ui, body| {
if let Some(pass) = tool_pass(&body.env) {
reply = Some(ToolHost::new().run(ui, &pass, &mut *tool.borrow_mut()));
}
});
let reply = reply.unwrap_or_default();
seen.set(reply.readout.is_some_and(|readout| readout.rows.iter().any(|(_, value)| value == "123 px")));
});
if let Some(shown) = shown {
+11 -4
View File
@@ -4,7 +4,9 @@ use craft_behavior::CanvasView;
use craft_behavior::canvas::zoom;
use craft_behavior::kurbo::Vec2 as DocVec;
use craft_behavior::kurbo::{Point, Rect, Size};
use craft_ui::canvas::{Canvas, CanvasTool, HandTool, LayerBounds, NavigationOptions, RotateViewTool, ToolHost, ViewCommands, ViewTarget, ZoomTool};
use craft_ui::canvas::{
Canvas, CanvasTool, HandTool, LayerBounds, NavigationOptions, RotateViewTool, ToolHost, ViewCommands, ViewTarget, ZoomTool, tool_pass,
};
use craft_ui::contract::{Bind, ShowContainer as _};
use craft_ui::runtime::access::Role;
use craft_ui::runtime::commands::{self, FireSource};
@@ -41,12 +43,17 @@ impl Rig {
let mut fixture = Fixture::new(move |ui| {
let room = ui.available_rect_before_wrap();
let current = shown_view.get().unwrap_or_else(|| start(room));
let shown = Canvas::new("Document").document(ViewTarget::from(DOCUMENT)).navigation(navigation).view(current).show(ui, |_, _| {});
let reply = ToolHost::new().run(ui, &shown.output, &mut *shown_tool.borrow_mut());
let mut reply = None;
let shown = Canvas::new("Document").document(ViewTarget::from(DOCUMENT)).navigation(navigation).view(current).show(ui, |ui, body| {
if let Some(pass) = tool_pass(&body.env) {
reply = Some(ToolHost::new().run(ui, &pass, &mut *shown_tool.borrow_mut()));
}
});
let reply = reply.unwrap_or_default();
if let Some(pan) = reply.pan {
shown_pans.borrow_mut().push((pan.delta, pan.scroll_all));
}
shown_view.set(Some(reply.view.unwrap_or(current)));
shown_view.set(Some(reply.view.or(shown.output.view).unwrap_or(current)));
});
fixture.ctx().set_pixels_per_point(ppp);
fixture.settle();
+51 -53
View File
@@ -9,6 +9,7 @@ use craft_behavior::kurbo::Rect as DocRect;
use craft_behavior::{ColumnKey, ColumnWidth, PixelSize, RulerUnits, Ticks, keyed};
use craft_ui::canvas::{
Canvas, CanvasScrollbars, CanvasSpace, NoTool, PageFrame, Pasteboard, PixelRect, RasterDisplay, RasterSource, RulerText, Rulers, ToolHost,
tool_pass,
};
use craft_ui::canvas_controls::{Guides, Marquee};
use craft_ui::contract::SizeLimits;
@@ -120,7 +121,7 @@ fn ruler_text(kind: UnitKind) -> RulerText {
pub(super) fn show_layers(ui: &mut Ui, at: egui::Rect, layers: &[Layer], size: PixelSize) {
for layer in layers.iter().rev().filter(|layer| layer.visible) {
let source = LayerFill { layer, size };
let _ = RasterDisplay::new(layer.name.clone(), &source).show_at(ui, at);
let _ = RasterDisplay::new(layer.name.clone(), &source).picture().show_at(ui, at);
}
}
@@ -158,14 +159,6 @@ impl RasterSource for LayerFill<'_> {
}
}
/// What the canvas body found out in a pass.
struct BodyResult {
/// The view the scroll bars set.
scrolled: Option<craft_behavior::CanvasView>,
/// The pointer is over a scroll bar, so the tool leaves the press alone.
over_bars: bool,
}
/// The document area: the pasteboard, the visible layers, the selection, the rulers with their guides and the scroll
/// bars on a canvas whose tool host runs the current tool and reports the one view.
fn canvas(ui: &mut Ui, document: &mut Document, tool: Tool, tools: &mut Tools) {
@@ -176,51 +169,56 @@ fn canvas(ui: &mut Ui, document: &mut Document, tool: Tool, tools: &mut Tools) {
let (view, show_rulers) = (document.view, document.rulers);
let editing = matches!(tool, Tool::Move | Tool::Marquee);
let canvas_id = ui.scope_id().with("mock document canvas");
let shown = {
let Document { layers, guides, guide, marquee, zero, units: unit, .. } = &mut *document;
Canvas::new("Document").id(canvas_id).view(view).document(page.size()).show_rulers(show_rulers).rulers(units, units, *zero).show(
ui,
|ui, body| {
let _ = Pasteboard::new("Pasteboard", &pages).show_at(ui, body.rect);
show_layers(ui, body.rect, layers, pixels);
if let Some(rect) = *marquee {
let _ = Marquee::rect("Selection", rect).show_at(ui, body.rect);
// What the host reported; none in a measuring run, where it does not run.
let mut reported = None;
let mut scrolled = None;
let _ = Canvas::new("Document").id(canvas_id).view(view).document(page.size()).show_rulers(show_rulers).rulers(units, units, document.zero).show(
ui,
|ui, body| {
let _ = Pasteboard::new("Pasteboard", &pages).show_at(ui, body.rect);
let mut content = body.rect;
let mut pending = None;
let Document { guides, guide, zero, units: unit, .. } = &mut *document;
if show_rulers {
let rulers = Rulers::new("Rulers", Bind::bound(zero)).units(&UNITS).show_at(ui, body.rect);
content = rulers.content_rect();
pending = rulers.guide;
if let Some(picked) = rulers.unit_picked {
*unit = picked;
}
let mut content = body.rect;
let mut pending = None;
if show_rulers {
let rulers = Rulers::new("Rulers", Bind::bound(zero)).units(&UNITS).show_at(ui, body.rect);
content = rulers.content_rect();
pending = rulers.guide;
if let Some(picked) = rulers.unit_picked {
*unit = picked;
}
}
let mut controls = Guides::new("Guides", canvas_id, Bind::bound(guides)).interactive(editing);
if let Some(selected) = *guide {
controls = controls.selected_guide(selected);
}
if let Some(drag) = pending {
controls = controls.pending(drag);
}
if let Some(select) = controls.show_at(ui, body.rect).select {
*guide = select;
}
let bars = CanvasScrollbars::new("Scroll bars", Bind::given(view), page).show_at(ui, content);
BodyResult { scrolled: bars.view.value().copied(), over_bars: bars.over }
},
)
};
let result = shown.inner;
let host = ToolHost::new().momentary(&mut tools.momentary).enabled(!result.as_ref().is_some_and(|result| result.over_bars));
let reported = match tool {
Tool::Hand => host.run(ui, &shown.output, &mut tools.hand),
Tool::Zoom => host.run(ui, &shown.output, &mut tools.zoom),
Tool::Move => host.run(ui, &shown.output, &mut MoveTool::new(document, Directions::Four)),
Tool::Marquee => host.run(ui, &shown.output, &mut MarqueeTool::new(document)),
Tool::Brush | Tool::Pencil | Tool::Eraser | Tool::Stamp => host.run(ui, &shown.output, &mut NoTool),
};
if let Some(next) = result.and_then(|result| result.scrolled).or(reported.view) {
}
let mut controls = Guides::new("Guides", canvas_id, Bind::bound(guides)).interactive(editing);
if let Some(selected) = *guide {
controls = controls.selected_guide(selected);
}
if let Some(drag) = pending {
controls = controls.pending(drag);
}
if let Some(select) = controls.show_at(ui, body.rect).select {
*guide = select;
}
let bars = CanvasScrollbars::new("Scroll bars", Bind::given(view), page).show_at(ui, content);
scrolled = bars.view.value().copied();
// The tool runs after the controls, which take a press first, and before the picture and the selection,
// which show what it did with this pass's input. The tool leaves the press alone over a scroll bar.
if let Some(pass) = tool_pass(&body.env) {
let host = ToolHost::new().momentary(&mut tools.momentary).enabled(!bars.over);
reported = Some(match tool {
Tool::Hand => host.run(ui, &pass, &mut tools.hand),
Tool::Zoom => host.run(ui, &pass, &mut tools.zoom),
Tool::Move => host.run(ui, &pass, &mut MoveTool::new(document, Directions::Four)),
Tool::Marquee => host.run(ui, &pass, &mut MarqueeTool::new(document)),
Tool::Brush | Tool::Pencil | Tool::Eraser | Tool::Stamp => host.run(ui, &pass, &mut NoTool),
});
}
show_layers(ui, body.rect, &document.layers, pixels);
if let Some(rect) = document.marquee {
let _ = Marquee::rect("Selection", rect).show_at(ui, body.rect);
}
},
);
let reported: craft_ui::canvas::ToolHostResponse = reported.unwrap_or_default();
if let Some(next) = scrolled.or(reported.view) {
document.view = next;
}
}
+14 -5
View File
@@ -3,7 +3,7 @@
use craft_behavior::CanvasView;
use craft_behavior::kurbo::{Point, Size};
use craft_ui::canvas::{Canvas, HandTool, NavigationOptions, ToolHost, canvas_space};
use craft_ui::canvas::{Canvas, HandTool, NavigationOptions, ToolHost, canvas_space, tool_pass};
use craft_ui::contract::{Bind, ShowContainer as _};
use craft_ui::patterns::canvas::NavigatorPanel;
use craft_ui::testing::{Fixture, trial};
@@ -48,13 +48,22 @@ impl Document {
NavigatorPanel::new("Navigator", Bind::bound(&mut *held.borrow_mut()), DOC).navigation(navigation).show(ui);
}
let given = *held.borrow();
let shown =
Canvas::new("Document").view(given).document(DOC).navigation(navigation).show_rulers(ruled.get()).show_at(ui, at.get(), |_, body| {
let mut hosted = None;
let shown = Canvas::new("Document").view(given).document(DOC).navigation(navigation).show_rulers(ruled.get()).show_at(
ui,
at.get(),
|ui, body| {
if let Some(space) = canvas_space(&body.env) {
saw.borrow_mut().push((body.rect, space.view));
}
});
let next = if options.hand { ToolHost::new().run(ui, &shown.output, &mut hand).view } else { shown.output.view };
if options.hand
&& let Some(pass) = tool_pass(&body.env)
{
hosted = Some(ToolHost::new().run(ui, &pass, &mut hand));
}
},
);
let next = hosted.and_then(|hosted| hosted.view).or(shown.output.view);
if let Some(next) = next {
*held.borrow_mut() = next;
}