Commit Graph
1087 Commits
Author SHA1 Message Date
Brandon Thomas affce22f4f Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	docs/gaps.md
2026-10-19 02:52:49 -04:00
Brandon Thomas f78bf721e8 Merge storytold/main into codex/delete-parent-pages 2026-10-19 02:52:27 -04:00
Brandon Thomas 0e4d1cef7e Merge storytold/main into fonts/reload-changed-fonts 2026-10-19 02:51:28 -04:00
Brandon Thomas fcb83fd12d Merge storytold/main into codex/delete-parent-pages 2026-10-19 02:51:25 -04:00
Brandon Thomas 5e94f78c2e Merge storytold/main into screen-mode-bleed-slug 2026-10-19 02:51:20 -04:00
Brandon Thomas 147d1a0291 Merge pull request #1196 from seanth/tool-units
(fix)Tools: readouts measure in the document's ruler units
2026-10-19 02:49:58 -04:00
Brandon Thomas 90fdcc3807 Merge pull request #1216 from MarekSpodBiedry/issue-1203
Make the dock collapse and expand chevrons clickable (#1203)
2026-10-19 02:49:55 -04:00
Brandon Thomas 33427bb053 Merge pull request #1272 from marcoarnulfo/fix/document-setup-bare-unit
Document Setup: read a number without a unit in the document's units
2026-10-19 02:49:27 -04:00
Brandon Thomas f026090935 Merge pull request #1289 from MarekSpodBiedry/issue-1251
Align Story Editor paragraph style labels with the wrapped text rows (#1251)
2026-10-19 02:49:17 -04:00
Brandon Thomas 043383f2dc Merge pull request #1290 from MarekSpodBiedry/issue-1260
Show New Document preset sizes in the selected units (#1260)
2026-10-19 02:49:13 -04:00
Brandon ThomasandClaude Opus 5.5 dcb0417b63 Dock: the » chevron runs window.collapseToIcons
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 02:38:32 -04:00
MarekSpodBiedry 4df5d1639c Align Story Editor paragraph style labels with the wrapped text rows (#1251) 2026-10-18 23:40:40 +02:00
MarekSpodBiedry 551886c133 Show text stroke options in the Stroke panel when text is selected (#1265) 2026-10-18 23:38:00 +02:00
MarekSpodBiedry 6e0b50a819 Show New Document preset sizes in the selected units (#1260) 2026-10-18 23:35:57 +02:00
seanth 8f1f20f24a Merge branch 'storytold:main' into tool-units 2026-10-18 13:36:03 -04:00
Marco Arnulfo 526eeda545 Document Setup: read a number without a unit in the document's units (fixes #1247) 2026-10-18 18:04:22 +02:00
Hamza b8ae284a4a View: Bleed and Slug screen modes show their area; draw the slug guide
Bleed and Slug were selectable from the toolbar, the View menu and
`view.screenMode`, and were stored, but the canvas only ever asked whether the
mode was Preview or Presentation. Both therefore drew exactly what Normal drew:
guides, frame edges, the other non-printing marks, and content reaching across
the pasteboard.

They are preview modes now, and what each spread shows reaches out to its box:
the bleed for Bleed, the bleed and the slug for Slug (Slug shows every printing
element, and a slug narrower than the bleed does not pull the edge back in).
Preview and Presentation still stop at the trim.

The slug guide was never drawn either, so the Slug colour in Preferences ›
Guides & Pasteboard was stored, exported and round-tripped while nothing read
it. It is drawn beside the bleed guide, in that colour.

`Spread::bleed_rect`'s body becomes `outset_rect`, which measures either offset
from the page edges, with `bleed_rect` and `slug_rect` as its named callers.
2026-10-18 20:47:01 +05:00
harrisonoconnorhover 9434e96dbf fix: integrate parent deletion with current main (#956) 2026-10-17 17:52:04 -04:00
skylar taylor-barrick 9fd0a881f7 Merge storytold/main into linked-path-checks
The conflict was in links.rs, where main's atomic relink work (b050343a) and
this branch's path gate both changed `update`. Kept main's mechanism (build the
replacement with relinked_asset, then insert it) and this branch's gate (a link
craft-docpath refuses is missing and never read).

relinked_asset now takes the path to read and the link to record separately.
Previously they were one argument, safe only because update passed the raw stored
link; passing the resolved path to the old signature would have rewritten every
relative link to an absolute one on each refresh.

Also passes None for the document in main's embedded-status test, where the asset
has no link so the document is irrelevant.
2026-10-17 12:39:14 -06:00
MarekSpodBiedry 1b1a66ee77 Make the dock collapse and expand chevrons clickable (#1203) 2026-10-17 14:36:00 +02:00
Claude 3eb7b5085b Tools: readouts measure in the document's ruler units
Tool readouts (the Page tool's size while dragging, smart-guide distances, the
resize readout) took their unit from the UI's own setting, which nothing changes
from picas, so a document set to inches read in picas. The tool context now takes
the active document's horizontal ruler unit, and the Page tool's W/H use the
horizontal and vertical units, as the Control and Properties fields do.

Test: tool_readouts_measure_in_the_documents_units (picas before).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CgGsJkVe5GYG9qK6VFdECa
2026-10-17 06:27:34 +00:00
skylar taylor-barrick bc840130a4 Satisfy clippy's nonminimal_bool on rustc 1.96
Four sites already on main that `cargo xtask ci` cannot get past with the
current toolchain; each rewrite is the one clippy suggests and changes no
behaviour. `!x.is_some_and(f)` becomes `x.is_none_or(!f)`, and pdf_bounds
folds `!(a && b) || !c` into `!(a && b && c)` by De Morgan.

Unrelated to the merge they are committed beside; separated so that merge
stays a merge.
2026-10-16 20:20:36 -06:00
aiongg 248e10908b Follow paths stored in documents only on this computer or the document's share
Links, data sources, IDML package links and book chapters go through
io::document_path (craft-docpath) before they reach the file system:
relative paths resolve beside the document, and paths to other computers,
devices and URLs are missing, with the reason in links.list and Preflight.

IDML and INDD packages read a linked file where its link points on this
computer, then from the link's trailing names beside the package, only
when it is a regular file up to 256 MB holding an image or a graphic. A
file URI that names a host keeps it as a network path.
2026-10-16 17:05:09 +00:00
Abdelrehman Fouad d78783b6bd Fonts: Type › Reload Fonts reads fonts changed on disk again
Fonts installed, edited or removed while the app runs needed a restart
(#328, #547). font.reload rescans the font folders, lets go of the shared
faces whose installed file changed (length or modification time) or is
gone, so the next lookup reads the file as it is now, and recomposes the
open documents with a new composition cache. It isn't an undo step.
2026-10-16 17:15:47 +02:00
harrisonoconnorhover 91a32730ef fix: allow deleting parent pages (#956) 2026-10-16 08:02:23 -04:00
aiongg 852db92b05 Merge branch 'fix-macwin' into next-integ 2026-10-16 06:40:54 +00:00
aiongg f309b08562 Integration: #1036 test that a selected group paints both ports of its text frame 2026-10-16 06:40:28 +00:00
aiongg e99783c756 Integration: "&" shows in native menu labels 2026-10-16 06:40:28 +00:00
aiongg 98be512f79 Merge branch 'fix-panelmenu' into next-integ 2026-10-16 06:27:33 +00:00
aiongg 11810ecbfc Integration: panel menus stay reachable in the docking layout 2026-10-16 06:27:17 +00:00
aiongg a9e2229cd6 Integration: Esc that closes a dialog doesn't reach the canvas 2026-10-16 06:25:01 +00:00
aiongg 39fe594553 Integration: Window › Minimize (⌘M) on macOS 2026-10-16 06:16:17 +00:00
aiongg 78bf14afb4 Merge branch 'fix-1067' into next-integ 2026-10-16 05:02:21 +00:00
aiongg 763c4fac08 Integration: #1067 large parent icons in a short Pages panel don't crash 2026-10-16 05:01:19 +00:00
aiongg 8f93a48c4d Integration: #1067 Panel Options' parent Show Thumbnails and size drive the parents' rendered thumbnails 2026-10-16 04:56:38 +00:00
aiongg dbf495bee9 Merge PR #1066 and #1067: Pages panel scroll areas, divider and Panel Options
- panels/pages.rs: #635's parent rows (rendered thumbnails, parents by id, the shown parent selected, double-click shows that parent) sit in #1066's parents scroll area, vertical and side by side; Panel Options' parent size sets the parent icon height (Extra Small: blank pages); thumbnail key = (uid, revision, page or parent, height); pages use ThumbOf::Page; #869/#870/#1058 kept (canvas refit after leaving parents, Delete Page/Spread through the delete-pages question, applyParent by id); #1067's narrow-spread label kept; tests: both sides.
- dock.rs: #343's floating-window frame kept, its body goes through scrolled_body so a floating Pages panel keeps its footer.
- dialogs.rs: deletePages, newWorkspace (#1058 and ours) and pagesPanelOptions arms side by side; HEAD's dialog widths plus pagesPanelOptions at 380.
- lib.rs: skip_delete_pages_warning and pages_parents_height/pages_panel both kept.
- i18n.rs, i18n/{ar,de,it,ja,ka,pt_br,uk}.rs: both sides' rows, no duplicate keys.
- ROADMAP.md: the two new lines in the log's style; dropped four 2026-10-14 lines the union merge duplicated.
2026-10-16 04:56:09 +00:00
aiongg 5d4834e537 Integration: #1036 the overset mark sits at the frame's real out port
The always-on mark uses thread::port_center, the position draw_ports and the Selection tool
use, so rotated and short frames get it on their right edge. Frames whose ports the selection
draws get no second mark. text_frames_in and overset_frames drop the unused transforms.
2026-10-16 04:53:37 +00:00
aiongg bc5799c046 Merge PR #1036: Overset marks for text frames inside groups
ROADMAP.md: the union merge re-added 13 log lines already present; kept one copy each. The PR's overset line moved into date order and took the group-ports clause; its other two lines describe work from other PRs and were dropped.
docs/ui-parity.md: merged cleanly next to #1033's row.
2026-10-16 04:51:29 +00:00
aiongg 21a6e6d90f Merge branch 'batch-tB' into next-integ
# Conflicts:
#	docs/gaps.md
2026-10-16 04:48:56 +00:00
aiongg 833db788af Merge branch 'batch-tA' into next-integ 2026-10-16 04:48:48 +00:00
aiongg 45178f283a Merge branch 'batch-tC' into next-integ 2026-10-16 04:48:45 +00:00
aiongg 699b5da7dc Integration: #1076 the release that ends a hold opening a tool flyout doesn't pick the tool and close it 2026-10-16 04:37:18 +00:00
aiongg eb2b2f1b5f Integration: #1043, #1059, #1074 French strings now in the shared table leave the French catalog 2026-10-16 04:37:17 +00:00
aiongg 51f790a092 Integration: #1059 canvas menu tests match rows in the canvas, not the Properties panel's Arrange button 2026-10-16 04:35:52 +00:00
aiongg 1014d841ac Integration: a dropped file without an extension is recognised from its first bytes 2026-10-16 04:29:27 +00:00
aiongg dd71077cef Integration: the New Document test checks that Mobile presets have no primary text frame 2026-10-16 04:29:27 +00:00
aiongg 0132523396 Integration: column counts and list numbers have their own captions; pt-BR and Arabic Pages menu rows 2026-10-16 04:29:27 +00:00
aiongg e082e69b03 Integration: #1081 the proxy test fills the Color Picker's rgb, model and edited fields, as the batch's picker reads them 2026-10-16 04:22:38 +00:00
aiongg f649f3cc45 Integration: #1099 the New Document preset test scrolls to A4, which sits below the poster sizes 2026-10-16 04:18:32 +00:00
aiongg 68b24da5c9 Integration: #1013 German table drops the 8 rows the branch already has and keeps "Anschnitt:" for Bleed: 2026-10-16 04:13:26 +00:00