Commit Graph
81 Commits
Author SHA1 Message Date
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 7cd391de7e One floating scroll indicator for every scroll area
ScrollBarLook is one look: a clear track and a thin dim thumb line along the track's outer edge
at rest (stroke.thick), the whole track thickness (handle.sm) over a tinted track under the
pointer or while pressed. The docked kind (chrome track, edge rule, inset thumb) goes:
canvas and timeline bars take the same look. CxCore::scroll_bar_state gives a bar's state,
hovered while the pointer is anywhere on the bar, for every painter of a bar.
2026-11-16 16:12:12 +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
FredApps a53b894e08 Merge remote-tracking branch 'origin/codex/fcp7-bounded-report' into w1693 2026-11-16 08:54:47 +01:00
FredApps 52fe6cb6cb Merge remote-tracking branch 'origin/main' into w1685
# Conflicts:
#	crates/timeline/src/fcp7.rs
#	crates/timeline/tests/it/fcp7.rs
2026-11-16 08:54:28 +01:00
FredApps d01d8e5f70 timeline: order fcpxml export after its limited form (Sonar duplication with otio) 2026-11-16 07:37:34 +01:00
FredApps 281508dc4b timeline: share one limited-push path for report levels; keep transition diagnostic levels; cover export limit 2026-11-16 07:06:09 +01:00
FredApps 5f3851a2ee Merge remote-tracking branch 'origin/main' into w1681 2026-11-16 07:05:24 +01:00
aiongg 3ceff195c7 Sync follow-ups: upstream's new tests in crates whose test executable runs trials are trials (print cups, ticket and windows_native, timeline interchange, update); craft-print's cups module documented (missing_docs), its tests under cfg(test) 2026-11-16 02:02:00 +00:00
aiongg dffc61a7e0 Merge storytold main 832883b5 (sync 16 Nov)
961 upstream commits since 7bb6c900. Resolutions:
- Test-only conflicts: upstream tests from before the base that our side
  cut stay cut; tests new upstream are kept (audio aac/config, layout,
  encode_format; cms lutfile; media mux; print windows_native, ticket;
  update self_update; xml hostile).
- Code our side moved, with upstream's change carried to the new place:
  craft-media mux roll sample groups (mux/boxes.rs) and writer-start
  offsets with overflow checks (mux/progressive.rs); craft-print's
  shrink-to-fit scale guard (sheets/plan.rs); craft-update's nextest
  archive detection (self_update/detect.rs); craft-vectorcraft-format's
  Tail::write_to_with (container.rs); craft-i18n's pedantic fixes
  (bidi.rs, negotiation.rs).
- craft-ui: the old crate's modules stay removed; gpu_test_lock guarded
  their per-test wgpu renderers, which the snapshot kit does not have.
- New upstream tests in crates that build their integration tests into
  the library's test executable are modules of tests/main.rs (audio
  flac_decode and qoa_oracle, cms, docpath, pcraft-format,
  vectorcraft-format).
- The 22 new crates are optional members of the craft facade.
2026-11-16 01:52:09 +00:00
aiongg f1f0333a5b Merge storytold next into the framework branch 2026-11-16 01:01:38 +00:00
FredApps 105d69c61c Merge remote-tracking branch 'origin/main' into otio 2026-11-16 00:06:43 +01:00
FredApps 9c6fa9ce33 timeline: say that the report limit counts every distinct entry
The limit mirrors FilmCraft's MAX_REPORT_ENTRIES, which bounds the report's
size and counts informational entries too. Document that rather than imply a
warning-only budget.
2026-11-16 00:06:43 +01:00
Dylan M. Taylor 7a316da2d3 timeline: offer bounded EDL parse diagnostics 2026-11-15 18:02:48 +00:00
Dylan M. Taylor f9605de124 timeline: offer bounded FCP7 diagnostics 2026-11-15 17:44:49 +00:00
Dylan M. Taylor 59755e3e71 timeline: bound FCP7 nested sequence imports 2026-11-15 17:43:35 +00:00
Dylan M. Taylor a864f0c27e timeline: offer bounded FCPXML diagnostics 2026-11-15 17:41:29 +00:00
Dylan M. Taylor a553c9f734 timeline: offer bounded OTIO diagnostics 2026-11-15 17:29:43 +00:00
Dylan M. Taylor 4ca26a5996 timeline: bound FCP7 nested sequence imports 2026-11-15 17:10:59 +00:00
aiongg e0b9e97529 panels-w14: net change of 3 commits
- panels-w14: written by an agent
- panels-w14: finished by an agent
- panels-w14: review fixes (review-1)
2026-11-15 09:18:07 +00:00
aiongg 6be6c241b1 framework-01-w14: net change of 1 commits
- framework-01-w14: written from its sheet
2026-11-15 04:46:05 +00:00
aiongg e7b6352729 framework-01-w8: net change of 10 commits
- framework-01-w8: written by an agent
- framework-01-w8: finished by an agent
- framework-01-w8: fade takes env (framework-01-w5's signature)
- framework-01-w8: review fixes (review-1)
- framework-01-w8: review fixes (review-1, files the rulings name)
- framework-01-w8: a content column adds no Ui of its own, so its children keep their ids when its width becomes bounded or unbounded (fw01 round 2)
- framework-01-w8: the keyframe lane story fills the width its time axis is fitted to (fw01 round 2)
- framework-01-w8: a body's reveal is queued as a jump for the next pass's step 4, like the scroll bar's moves (fw01 round 2)
- framework-01-w8: the filling-bar trial pages the narrow bar and reads only what its view shows (fw01 round 2)
- framework-01-w8: a body group names its container; a text part's keys read the selection it holds for its edit menu (top run round)
2026-11-15 04:46:05 +00:00
aiongg ace9f96d5c framework-01-w13: net change of 4 commits
- framework-01-w13: written from its sheet
- framework-01-w13: review fixes (review-1)
- framework-01-w13: review fixes (review-1, files the rulings name)
- Integration: ButtonGrid is an unregistered container (panels-w11 a16470ef9)
2026-11-15 04:46:05 +00:00
Dylan M. Taylor a44e1b7273 Reject cached FCPXML graphs that reach a rebuilding ancestor 2026-11-14 23:00:44 -05:00
Dylan M. Taylor 47036b5e63 craft-timeline: bound FCPXML traversal and retry truncated media 2026-11-14 22:57:47 -05:00
aiongg 2b5de84828 Design lint: layer the env values, route egui access through the adapter, derive setters, token and relation checks in tests
The gate's design-lint test finds nothing. Env value types (pane edge, column align, row pressed, in-bar), band fill and span live in the layer that uses them; the cursor image and inside label are read back by the higher layer. Hand setters become derived props, tests assert relations, and the remaining sites are listed exceptions with reasons. The shortcut chord chip's sample is built only for screen tests.
2026-11-14 05:05:04 +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 deeb91802f Lints: doc links, test lint allowances, struct update in tests, wildcard imports, dead code 2026-11-14 02:35:35 +00:00
aiongg b12d6387c5 Contract stubs: craft-automation, craft-layers, craft-font-manager, craft-timeline, craft-print 2026-11-14 02:34:37 +00:00
aiongg 894ecc6390 Lints: unambiguous write doc links, private doc links, contains 2026-11-14 01:58:46 +00:00
aiongg 206c1c5379 Lints: timeline story facts and icon ids 2026-11-14 00:56:27 +00:00
aiongg 328af6782e craft-timeline: craft-time is the one time model
craft-timeline's Tick, TimeRange, FrameRate, TimeDisplay, SMPTE field conversion and timecode
formatting are craft-time's, re-exported from time.rs as storytold's 5e24ea380 does, so
craft_timeline::time::* paths keep working. The timeline keeps what is about a timeline: TimeView
and VIEW_EXTENT_PAST_END, and TimeFormat as its time display (frame offset, compact feet + frames,
the audio samples and seconds readers) over craft-time's formatters and parsers. FrameRate's
locale-digit menu label is rates::frame_rate_label.

captions and edl use craft-time's field tuples, as storytold's do. The time trials that repeat
craft-time's own tests go; five that test craft-time code it did not test yet are in
crates/time/tests/timeline.rs.
2026-11-13 17:44:40 +00:00
Dylan M. Taylor 5e24ea380e Avoid duplicated timeline time primitives 2026-11-13 07:47:44 +00:00
aiongg 6924d6a1bf Rules are 1 pt wide and take a band of their own
Divider and edge rules take the thin stroke (1 pt, whole physical
pixels) instead of one physical pixel; grid rules over the document stay
one physical pixel.

The rules between a container's regions (above and under the header,
beside a ruled footer, before a ruled end region) each get a band in the
region layout, so no rule lies over a region's content at any scale.
Rules drawn along a rect's edge (footer bar, tile grid tail, timeline
graph bar, docked scroll bar, layer row toggle cells) are edge rules on
the side the rule belongs to, so the second pixel at 2x stays off the
neighbour. The split button's divider reads the divider rule's width.
2026-11-12 15:23:58 +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 c2dba2a1d5 craft-timeline: declare the interchange formats on the framework's time model
ale, build, edl, fx, path, rate and report are modules of the crate again, fcp7 and fcpxml behind the xml feature, otio behind otio, as storytold had them. The format list, the import and export options and the interchange error sit in interchange beside the neutral document and are re-exported at the crate root. The formats read and write time through rates, time and timecode: ALE rows through parse_time, an EDL timecode holds TimecodeFields, FCPXML format names use FrameRate's Display. Serde is always on, so the interchange types derive it unconditionally; the formats keep storytold's no-panic lints.

storytold's interchange tests run as trials of the lib's one test executable: the modules' own tests always, tests/it/{fcp7,fcpxml,otio} with the xml and otio features.
2026-11-12 14:50:08 +00:00
aiongg db654cfdd7 craft-timeline: frame-count timecode parsing, feet + frames, display ids, FrameRate::from_f64_within and Display
parse_frames reads typed timecode, frames and feet + frames as a frame count (drop-frame, relative to a current frame), and parse_time uses it for those displays. format_timecode_frames and format_feet_frames are public; TimeDisplay has id, from_id and frames_per_foot. FrameRate::from_f64_within snaps a container's rate to a standard one within a tolerance, and FrameRate's Display writes the rate as documents and diagnostics do (24, 23.976), without a unit.

storytold's time tests (src/time/tests.rs) run as trials on this API.
2026-11-12 14:42:05 +00:00
aiongg f7d6ae8094 Timeline: track header switches as icon toggle faces
Each switch cell shows a small ToggleButton face with the shared on look,
so the target and output switches show their on state as the old icon
buttons did. The collection's toggle cell beneath keeps the presses. The
row's own on/off icon looks go; one switch_name serves the column
headers and the faces.
2026-11-12 14:32:51 +00:00
aiongg 3da412f36b Toolbar separators between tool groups
AnnotationToolbar puts a vertical divider before each group button, as a
Bar separates its groups. GraphEditor's bottom bar draws a divider rule in
each gap between two button groups, inset from the bar's edges.
2026-11-12 14:32:51 +00:00
aiongg 522e71a4f0 Components that show data paint their enabled look faded when disabled
Picture, ColorWheel, ColorDisc, ColorRamp, TrackRamp, GradientSwatch,
BrushStrokeStrip, Histogram, GraphEditor, FontSample, CurveGraph,
ToneRamp, CurvePreview, VectorscopePlot and FramePreview declare
DisabledLook::Faded: their content is data painted with the content
painter, and their chrome has no Disabled look of its own. GradientSwatch
goes the way of Swatch: its edge loses its Disabled entry.
2026-11-12 14:32:51 +00:00
aiongg efc398a2f4 Timeline panel: headers sized by content, ruler on the lanes' origin, whole timecode
- HeaderColumns: one set of header columns per pass, worked out from the model before the view shows. The switch
  columns are the ones some track has; the name column is the widest track name with its pads and indent, or the
  width the user dragged; the headers are at least as wide as the timecode and toolbar block over them. Every pane's
  TrackStack, the top strip's head column and the TimelineView's inset (header_extent) take the same extent.
- The top strip's head column is the header extent and its columns touch; the marker strip and the ruler sit in a
  fill-width stack, so they span the time area from where the lanes start.
- BodyLayout::grid takes owned or borrowed columns.
- TimecodeField::large keeps the timecode face (equal-width digits), so its widest sample is its widest text.
- MeasureCx::field_text: an editable text's room with the caret past its last letter. TextField, NumberField,
  TimecodeField, DateField, ComboBox and the font picker size by it.
- Trial: the ruler starts where the lanes do, and no header has a column no track has.
2026-11-12 14:32:49 +00:00
aiongg aa08015546 KeyframeLane story: stopwatch and navigator on one line, the lane under them in a strip view fitted to 12 s at the stage width 2026-11-12 14:32:49 +00:00
aiongg 6df4c1ff7b TimelineRuler stories: Frames, Seconds and Minutes in one Ruler card 2026-11-12 14:32:49 +00:00
aiongg e54fed5fa3 MediaControls: trim ends across a seek track that fills the bar
The trim ends were Slider marks: small ticks under the track that the seek snapped to. Slider::trim draws the ends of a kept span as lines across the track, a thumb high, in the warning colour, without snapping; Slider::fill_width lets a track take the rest of its row. The media controls use both, as the old did.
2026-11-12 14:32:48 +00:00
aiongg 56857cb223 Timeline and GraphEditor stories show the whole component; the time area is sunken without a frame
The time area is a fill view, so a story in the flow gave it only its content: the Timeline showed its top strip inside the view's rounded sunken frame, and the GraphEditor, shown over a rect nothing reserved, showed nothing. Timeline gets show_at and its story the stage; GraphEditor fills its row's width and measures a plot over its bar, and its story shows it in a strip view. The view paints the sunken fill under its time area only, square and with no edge, as the old panel did, and the track headers stay on the panel. The graph's value labels stay inside the plot: the top line's label stood above it.
2026-11-12 14:32:48 +00:00
aiongg 49da095b61 TimecodeField: as wide as its widest time
The field took the text field's length and shortest width, about twice its digits. FieldStyle::sized_by_content gives the field look without them, for the fields whose measure is their whole width; NumberField's style uses it too.
2026-11-12 14:32:48 +00:00
aiongg b35ae1b4b1 TimelineRuler: split-edit marks in their own row under the tick labels
The tick body is the label line over a mark row one label line high, as the old ruler kept a tick row under its labels. The video bracket hangs from the row's top, the audio bracket stands on its bottom, and each tag stays inside the row, so neither covers a tick label.
2026-11-12 14:32:48 +00:00
aiongg e566475840 TimelineRuler: split-edit tags stay inside the ruler
A tag is centred on its bracket, which is shorter than a line of text, so
the audio tag hung below the ruler and leaves it under a larger text size
(the old ruler clipped its marks to its rect). The tag keeps its place
beside its arm, moved up or down only as far as it takes to stay inside.
2026-11-12 14:32:47 +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