Three findings from the review of #11490.
- A cleared ratio field with blank_when_zero now parses as zero instead of falling into the arithmetic hold, so deleting a side unsets it rather than restoring the old value.
- The Fill help's info button remembers its rect, so Esc and Enter in the frame the help opens go to the help: the shortcut pass runs before the options bar draws, and Esc used to cancel the pending crop first.
- Hiding the options bar (F twice, or Home) closes the Fill help, so its flag no longer keeps Enter and Esc away from the crop underneath.
Tests in tests/it/crop_options_bar_chrome.rs; all three fail without the fixes.
The Clone Stamp now starts, and comes back after Reset Tool and Reset All Tools, with the reference's 21 px soft round at 25 % spacing and no smoothing (#12601).
fresh_brush gives the Background Eraser the reference application's
reset tip, a 13 px hard round at 25 % spacing with Size control off, as
it gives the Brush its own (#11810). Reset Tool, Reset All Tools and the
tool's first use all start from it; other tools and strokes without a
brush keep their tips.
Main gained its own live Mixer Brush in #3627 (engine `cmd/brush_cmds/mixer_live.rs`, the
release path in `canvas/gesture.rs`), so this merge takes main's side for the engine, paint,
docs and scorecard files and drops this PR's parallel `LiveMixer` API and its engine test.
What stays from #5238 is the paint order: while a live painting tool is selected (and no dialog
owns the canvas), the image is prepared after this frame's pointer and navigation input, so a
dab or a wheel pan/pinch zoom shows in the frame it happens instead of one frame later. Ported
onto main's split `canvas.rs`, with its tests in `canvas/live_frame_tests.rs` and
`tests/it/live_stroke_canvas.rs`, adjusted for main (the removed `interface.enableAnimations`
preference, the new wheel event `source`, and the Mixer release that commits its preview pixels).
Co-Authored-By: bommerts <44821497+bommerts@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Reset All Tools cleared every tool's remembered brush, and a tool
without one takes the live brush when it is picked. With the Brush's
starting tip now differing from the other tools', that leaked: Reset All
from the Brush left the Pencil and Eraser on a 13 px soft tip, and from
another tool it left the Brush on a 20 px hard one. Reset All now gives
each painting tool other than the live one its own starting brush.
Also names the Brush tool's reset tip and updates tool_reset's docs.
Reset Tool and Reset All Tools gave the Brush tool the default 20 px
hard tip at 10 % spacing. The reference resets it to a 13 px soft round
(hardness 0 %, spacing 25 %). `fresh_brush` now takes the tool and
gives the Brush that tip; the other painting tools and
`BrushSettings::default()` keep today's tip.
The issue leaves a right-click during an ⌥-drag unmeasured, so it keeps
today's behaviour. `magnetic_drawing` held that menu back too; it now
skips a freehand segment.
The bar draws inside the canvas pass, whose write-back of its own camera
dropped the fit that commit_crop asks for, so Done kept the old zoom. The
stored view now wins when the bar changed it, as a view menu row's does.
done_fits_the_cropped_document starts at 50 % and fails without the fix.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The right-click check asked only whether a border existed. Over the
control channel no frame runs between events, so a border left on one
document stayed in place after a switch and kept the selection menu
from opening on the next. The check, now magnetic_lasso_ui::drawing,
also asks that the border belongs to the document in front, the same
test frame() uses to drop a stale border. The canvas, the control
channel and frame() share it.
agent_right_click_on_another_document_still_opens_the_selection_menu
fails without this change. The context-menu parity doc records the
behaviour.
With a Magnetic Lasso border in progress, a right-click on the canvas
opened the selection tools' menu over the live border, in the window and
over the control channel. As in Photoshop, it now opens nothing and the
border stays live: Enter or Esc still close or cancel it. With no border
in progress the menu opens as before. Cmd/Ctrl+right-click (the layer
list) is unchanged, since it was not measured.
Tests in crates/ui-egui/tests/it/magnetic_lasso_right_click.rs drive
both paths; the two "while drawing" tests fail without the fix.
- Draw the Crop task bar only on the active document's tile: a click into
another tile activates its document mid-pass, and the tile drawn after it
put the new frame's bar on itself for that frame.
- ui.inspect reports the bar hidden (and no rect) as soon as it can't show,
not only after the next draw.
- ui.set merges panels.task_bar field by field: {"at": [x, y]} keeps a pin,
{"pinned": true} keeps a dragged place; unknown nested fields are refused.
- Tests for each (each fails with its fix reverted), plus the task bar's
preset dropdown picking 1 : 1 in sync with the options bar.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The pinned central font manifest has no Tamil face (storytold/craft-fonts#63 adds one) and the
Linux runner has none installed, so the strict missing-glyph policy panicked on the Tamil
labels. Tamil keeps every label and state check; a guard fails once the manifest ships Taml.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The Crop tool gets the reference application's contextual task bar: a small floating
bar centred 11 pt under the crop frame with a grip, the preset dropdown (the options
bar's own, so both stay in sync), Straighten, a ⋯ menu (Hide bar, Reset bar position,
Pin bar position) and, while a crop is pending, Cancel and Done. It follows the frame,
stays inside the canvas, and stays put once dragged or pinned. Window › Contextual Task
Bar (after Tools, as in the reference) shows and hides it.
The bar itself is a reusable widget (widgets/task_bar.rs): position rule, grip, ⋯ menu
and the hide/pin/place state in Panels (kept with the panel layout across restarts,
read by ui.inspect › taskBar, set by ui.set {panels}). A context supplies only its
controls and where ⋯ goes; the Crop contents are tools/crop_task_bar.rs. Generative
Expand stays out until #41.
Also: Lucide pin and rotate-ccw icons, six new strings in all 27 catalogues, parity
661/661 (FLOOR raised), control-protocol docs. Three tests about the options bar's
Ratio dropdown now hide the task bar, which shows the same dropdown.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
From review: release compared the frame with where it started, so a click on a handle of the untouched frame counted as a change (a Resize that resized nothing), and an Alt-drag from the centre that drew the same frame again counted as none. It now asks whether the gesture changed the frame at some point (drag_moved, including the release's own position); turns and image moves keep their checks.
main added the turning grid and draws the guides for the visible part of the frame (current_guides_for_frame). Kept from both: the canvas calls main's guides with this PR's frame look, and this PR's FrameLook functions sit beside main's visible_frame and turn_grid. The overlay still waits for the crop's first change, except while a turn or a straighten line is in progress, whose guides show from the start as main's tests expect.
A press inside the untouched default frame starts a Draw, and release counted every Draw as the first change, so an unmoved click showed the shield, the overlay and the started outline around the same frame. A Draw that leaves the frame it was pressed on is no change, as a click outside it already wasn't.
Since #10396 Esc hides the crop frame until the next press (#10370), so the
test expects no frame after Esc instead of a new default one.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Main's #10905 (#10867) turns the Background into Layer 0 when a crop keeps
the cropped pixels, so the corners a turn uncovers stay transparent instead
of taking the background colour. The #10950 test now expects that for its
Delete Cropped Pixels off cases; with it on the corners are still the
background colour.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>