Commit Graph
84 Commits
Author SHA1 Message Date
aiongg 2b66d91e8b IME engine: the input method's byte-counted delete-surrounding deletes the characters those bytes cover, converted at the editor against its text around the caret 2026-11-16 21:20:27 +00:00
aiongg 1295b96958 text, timeline: composer docs and trials in the framework's trial form (docs, gate) 2026-11-16 20:57:00 +00:00
aiongg b1766bb698 Merge remote-tracking branch 'upstream/next' into fw/mac1 2026-11-16 19:42:31 +00:00
aiongg 9d61d87e46 cargo fmt 2026-11-16 18:29:58 +00:00
aiongg 1d8c7d13a2 Merge branch 'fw/mac1-bars' into fw/mac1
# Conflicts:
#	crates/ui-contract/src/contract/body/hooks.rs
#	crates/ui-shell/src/shell/app_shell.rs
#	crates/ui-shell/tests/it/shell/app_shell.rs
2026-11-16 16:25:37 +00:00
aiongg 49258624fc Inspector and Text Styles panels take no padding of their own: the dock group insets them 2026-11-16 16:13:59 +00:00
aiongg b47e5a28c7 TypeBar's size field shows the size glyph of the Character panel's size row 2026-11-16 16:10:08 +00:00
aiongg 8296832417 A field takes its content width among a bar's members
ContainerProps::content_in_bar keeps a container from the width in a bar; Field sets it, and an explicit sizing
clears it. The Content sizing every bar set on its fields is gone.
2026-11-16 16:02:09 +00:00
aiongg 2df33d2f01 Merge remote-tracking branch 'upstream/main' into sync/main-1116
# Conflicts:
#	Cargo.lock
#	crates/audio/src/lib.rs
#	crates/exr/src/decode.rs
#	crates/font-catalog/src/lib.rs
#	crates/ps/src/lib.rs
#	crates/svg/Cargo.toml
#	crates/text/Cargo.toml
#	crates/text/src/lib.rs
#	crates/video/Cargo.toml
#	crates/video/src/lib.rs
2026-11-16 14:23:07 +00:00
aiongg f647f41e82 Merge branch 'dl/api' into dl/all 2026-11-16 13:39:11 +00:00
aiongg fbe5a16ffe design-lint: api/non-exhaustive: #[non_exhaustive] on public types and variants, constructors where other crates build them 2026-11-16 13:31:29 +00:00
aiongg a7bc89dde1 design-lint: props: derive the setters of text components (#[prop]) and drop the hand setters 2026-11-16 13:27:45 +00:00
FredApps 5acfead5b6 text: cover the paragraph composer's justified, hyphen-limit, credit and measure paths 2026-11-16 07:08:34 +01:00
aiongg cc00dbd368 Clippy and test-target lints: redundant must_use, type aliases for complex types, boxed large variants, argument structs, struct-update initialisers, deprecated egui calls, unused imports and dead code; the swatch library's reorder test runs as a trial 2026-11-16 02:30:55 +00:00
aiongg e0633b2164 tfix4-f6: TextEditor claims Escape and reports every session end in TextEditorOutput::ended 2026-11-15 21:32:40 +00:00
Dylan M. Taylor 54485a66ce Test malformed break ordering 2026-11-15 19:19:04 +00:00
Dylan M. Taylor b0cbe87bdb Reject unordered paragraph breaks 2026-11-15 19:18:30 +00:00
Dylan M. Taylor 935dc00846 Share paragraph-wide line composer 2026-11-15 19:17:13 +00:00
Dylan M. Taylor 48dcbe61b1 Retain off-path glyph state 2026-11-15 19:02:30 +00:00
Dylan M. Taylor 375617e060 Expose caret stops for hit testing 2026-11-15 18:58:26 +00:00
Dylan M. Taylor 5bba73843d Share placed glyph model and caret geometry 2026-11-15 18:58:04 +00:00
aiongg 14d5ec609a cargo fmt 2026-11-15 10:23:21 +00:00
aiongg a303fcbd62 tools-w5: net change of 3 commits
- tools-w5: written from its sheet
- tools-w5: repair 1
- tools-w5: review fixes (review-1)
2026-11-15 04:46:08 +00:00
aiongg f0aaef0ca0 tools-w4: net change of 2 commits
- tools-w4: written from its sheet
- tools-w4: review fixes (review-1.md)
2026-11-15 04:46:08 +00:00
aiongg 280aa468e7 tools-w6: net change of 3 commits
- tools-w6: written by an agent
- tools-w6: review fixes (review-1)
- Integration: synthetic input trials keep canvas-widgets-w13's queued-pass trial beside tools-w6's
2026-11-15 04:46:08 +00:00
aiongg 941cccf829 panels-w13: net change of 1 commits
- panels-w13: the bare-caret warning answers every attempt to apply a character style, a click on the selected row and Enter included (tools run round)
2026-11-15 04:46:05 +00:00
aiongg 2be14c1ac5 panels-w13: compile fix (include row field is FnMut: the grid body runs per pass) 2026-11-14 17:56:01 +00:00
aiongg 552da163a2 panels-w13: review fixes (review-1) 2026-11-14 17:56:01 +00:00
aiongg 2fa69d40d8 panels-w13: repair 1 2026-11-14 17:56:01 +00:00
aiongg 6c3fe5e209 panels-w13: written from its sheet 2026-11-14 17:56:01 +00:00
aiongg 0e216b6257 Contract stubs: decision pass 2026-11-14 16:07:24 +00:00
aiongg e9e3a961f4 Merge next (CI lint fixes) into phase2/stubs
# Conflicts:
#	crates/color/src/ui/swatches/menu.rs
2026-11-14 03:13:33 +00:00
aiongg 3329f24220 Contract stubs: craft-text, story-render, craft-fonts-build (stage 8) 2026-11-14 02:55:10 +00:00
aiongg deeb91802f Lints: doc links, test lint allowances, struct update in tests, wildcard imports, dead code 2026-11-14 02:35:35 +00:00
aiongg 7808f7f6d2 Lints: fix clippy, rustdoc and test findings (shadowed f32 module, unused import, private doc link, struct-update defaults, test attributes lost in the 13 Nov sync) 2026-11-14 00:15:29 +00:00
aiongg a17171af48 Lints: drop the workspace missing_docs lint and warn on it in the framework crates that document every public item 2026-11-14 00:15:29 +00:00
aiongg 73030467ae IME engine fix round 1: only the IME owner's report counts; retired resets come from the integration
- note_editor ignores every editor but the IME owner, so a second editor shown after it leaves the owner's
  composing report standing; editor_history answers non-owners (false, false).
- egui repinned to the fork's craft/ime-reset-retired (9b1f60c60): Event::ImeResetRetired reports a reset request
  egui-winit or PlatformOutput::append dropped without a completion. The engine asks again on the retirement of
  its own request; the focus check and the no-output retire in end_pass are gone. The test fixture reports
  retirements where egui-winit does (focus loss, no IME output, another IME context, a newer request, egui's
  dropped requests).
- The sheet grid's point mode ends a composition in the draft, its marked text kept as typed.
- TextEditor applies a pass's input before its press (the press is the pass's last pointer event, H0), so a
  preedit and a press in one raw frame change the marked text once and the press interrupts.

Trials: a reset the integration retires is asked again (craft-ui-contract); the click trial gains a second
editor shown after the composing one and a preedit-then-press frame (craft-text).
2026-11-13 16:15:16 +00:00
aiongg f910b4fe3c IME engine: an editor's own end of composition interrupts the OS composition; resets end only with their own completion
EditorState.composing replaces EditorState.revision (and TextEditorHost::revision): an editor that reported
composing and now does not ended the composition itself (a press in its text, a selection, an app edit over the
marked text), and the engine interrupts the OS composition and drops its late events. TextEditor and the sheet
grid report their marked text; editors that show none report false throughout.

The reset fence ends only with the completion of the engine's latest request (ImeResetId); an earlier request's
completion is stale. A request the integration can no longer answer (a pass with no IME output, an unfocused
window) is retired and asked again when an owner returns.

Trials: preedit and a click during composition for a canvas TextEditor, with one press per pass holding the late
commit for the next pass (craft-text); reset requests and stale completions (craft-ui-contract).
2026-11-13 16:15:16 +00:00
aiongg 74a1426e57 F-5 review: the host reports the autoscroll step from the pass clock; the hover band is size.hit.edge inside the view's rect; a secondary background press leaves a text session open 2026-11-13 01:08:19 +00:00
aiongg 47a49e542d TextEditor: a press on the canvas background commits the session 2026-11-13 01:08:19 +00:00
aiongg f7f75c178f Sizing::FillWidth makes a leaf fill its row's leftover room
Component::fills defaults to the width when the caller set Sizing::FillWidth,
and the sizing stays on the component after step 1 so the layout hooks read
it. Button, TextField and Slider lose their fill_width props and Swatch and
GradientSwatch their fill flags; callers set Sizing::FillWidth. The blend
select in BlendRows takes the room before Opacity, as in PhotoCraft.

A contract trial checks that a FillWidth leaf takes the row's room and a
Content leaf does not.
2026-11-12 15:12:10 +00:00
aiongg a3434176e4 Dialog bodies: the content sits directly in the dialog body, which is already a stack, so fill-width children take the dialog's width; the Tabs dialog's Position column is as wide as its field and Alignment and Leader share the rest 2026-11-12 14:32:57 +00:00
aiongg b19f52dde8 Content painters paint data colours in the component's data mode
DataMode holds the one mapping of a data colour (DataMode::color) and maps
every colour of a shape with it (DataMode::shape). ContentPainterCx gets
data_shapes for shapes whose colours are data, and its data methods
(picture, checker, checker_with, ramp) paint through the mode, sharing
data_picture and data_checker with Draw::texture and Draw::checker. A
States component's ramps, pictures and checkers in a content painter dim
while it paints its Disabled state, as its Draw's data colours do.

The histogram's bins and outlines and the notes editor's document text
paint through data_shapes.
2026-11-12 14:32:51 +00:00
aiongg 935613c4f7 Columns place their text as their spec says: rows take each column's alignment and tabular figures from the collection, and an end-aligned column's header ends at its cell's end; ListRow::columns goes 2026-11-12 14:32:49 +00:00
aiongg 0a724a2342 FindReplaceDialog stories: built in the gallery (craft-text find feature), open bool, dialog kept while open 2026-11-12 14:32:49 +00:00
aiongg 24ea1e849e NotesEditor stories: the old five-paragraph speaker notes as Default 2026-11-12 14:32:49 +00:00
aiongg cba374046d TextRuler: the decimal stop's dot at the size WordCraft draws it
Its radius was the thick stroke, about twice WordCraft's 1.1 pt, so the dots crowded the ruler.
2026-11-12 14:32:48 +00:00
aiongg 13221fd697 Collections take their width from content where their column gives none, and honour their pad
A collection that fills the width (Fill or FillWidth) follows the rule a
container does: where the enclosing body does not give its width (sized
from content, or a content column), a measuring run takes the width from
its content (header least width, else its largest row, at least its
ideal_width) and the column holds it across the width it settles on. A
FillWidth TabStrip or list in a dialog's column no longer sets the
column to the screen's width. Env::gives_width names the rule for both.

Collections honour ContainerProps::pad as containers do: the items hook
reports it (ShapeHooks::pad), the pass carries it in Resolved::pad, and
step 5, the measure view's room and step 7's content rect read the
padding through steps::padding. The header, rows, scroll bar and empty
text sit inside it; the surface covers the whole rect. #[container]
forwards pad, so Panel's own copy goes.

The spelling, file list and glyph wells are a List or TileGrid with
surface(Sunken).pad(Control); RelinkDialog's table is FillWidth.
2026-11-12 14:32:48 +00:00
aiongg 8703a667ba FooterBar: lay panel actions out from the reading end
The first action given sits at the end edge, as the old PanelFooter and
Photoshop's panel footers place them; a start group keeps its order.
Callers give their actions from the end edge: Layers, Channels,
Actions, Pages, the styles panel, the preset footer and MediaBin.
The filter gallery keeps Move Up and Move Down at the start edge.
LinkList's actions read as in the old: the menu at the start edge,
Relink at the end edge.
2026-11-12 14:32:48 +00:00
aiongg 9b22aa4e0f Fill propagates down a column whose width is given
A content-sized inline container shown in a `Stack` body given its width
passes that width on to its own body: its children measure and show as in
a given column, so a child that fills (a fill-width row, a list, a divider,
a picture, a side-labelled control) takes the width, and the container
takes what its content took. A content-sized mount (dialog, popover, menu),
a row, a grid or a held container stops it, so their bodies stay content
columns and measure as before.

The env carries the fact as `given_column`, set by a `Stack` body that is
not a content column and listed in the measure key's env facts. No pass,
record or measuring run is added.

Panel roots that set `fill_width()` only to span their pane now take the
default: CharacterControls, ParagraphControls, TimecodePanel,
ReorderableSections and BlendIfBar each hold a fill child, and where they
sit in a content column (BlendIfBar in the Layer Style page) the column
around them hugs them either way.

The fill_column trial shows the given column, nesting, a row stopping it,
the hug kept in a popover, and the measuring-run count against a
fill-width column.
2026-11-12 14:32:47 +00:00