Commit Graph
5122 Commits
Author SHA1 Message Date
Dylan M. Taylor 5518b65320 Merge pull request #2658 from dotCooCoo/feat/vj-baseline-grid
Compose: vertical justification keeps grid-aligned lines on the baseline grid
2026-11-12 16:43:08 -05:00
Dylan M. Taylor 2b305c9c00 Merge branch 'feat/vj-baseline-grid' of github.com:dotCooCoo/designcraft into codex/integrate-2658b 2026-11-12 16:28:06 -05:00
Dylan M. Taylor 9847f972da Update recovery test for explicit write conflict 2026-11-12 16:27:52 -05:00
Dylan M. Taylor 076e653ac3 Merge remote-tracking branch 'upstream/main' into codex/integrate-2658b 2026-11-12 16:27:39 -05:00
Dylan M. Taylor 520aeeefe1 Merge pull request #2652 from dotCooCoo/feat/text-frame-options-type-tool
Text: Text Frame Options open from the Type tool and change the frame holding the caret
2026-11-12 16:09:26 -05:00
dotCooCoo fb77a73d93 Compose: Center on the grid takes the fitting step nearest the middle in a shaped frame
When the grid step nearest the centered place puts the lines outside a frame that narrows and widens again, Center now tries the steps on both sides of it, nearest first, instead of only the steps above it.
2026-11-12 13:05:34 -08:00
dotCooCoo 946e3ea4c1 Compose: grid-aligned vertical justification takes only grid steps that fit a shaped frame
In a frame that narrows and widens again, Bottom, Center and Justify now
try lower grid steps until the lines fit the outline, and leave the lines
in place when none does, instead of taking the next lower step unchecked.
A grid whose step is too small to count across the column is now treated
as no grid when a line is placed, so the line keeps a finite baseline.

Tests cover a waist-shaped frame on a 40 pt grid, a tiny-step grid that
starts away from the line, and Justify with a wrapped paragraph under
All Lines and First Line Only.
2026-11-12 13:05:34 -08:00
Dylan M. Taylor 9fe0dd5197 Merge pull request #2666 from dotCooCoo/fix/recovery-off-interface-thread
Recovery: the timer writes recovery data on a background thread
2026-11-12 16:01:55 -05:00
Dylan M. Taylor fc5221060c Fix vertical justification test arguments 2026-11-12 15:59:29 -05:00
Dylan M. Taylor f88e6711e0 Merge latest main into baseline grid justification PR 2026-11-12 15:54:56 -05:00
Dylan M. Taylor 7362fffbcf Merge pull request #2654 from dotCooCoo/fix/effect-damage-bounds
Canvas: moving an object with a drop shadow repaints only its area
2026-11-12 15:50:44 -05:00
Dylan M. Taylor bf9d27f9b3 Merge pull request #2667 from dotCooCoo/fix/bottom-aligned-text-wrap
Compose: vertical justification keeps text out of a wrap under it
2026-11-12 15:49:37 -05:00
dotCooCoo 6d8f26a6be Render: cull a scaled object by its scaled stroke and glow
Culling grew an object's box by its unscaled stroke and effect outset,
so a view or repaint patch that showed only the outer part of a scaled
object's stroke or hardened glow skipped the object. Culling now scales
both by the object's largest scale factor, as drawing does. The CMYK
ink-pass area grows each object, and each nested child, by its stroke
and effect outset under its full transform.
2026-11-12 12:48:49 -08:00
dotCooCoo ba4f45e522 Merge main into feat/text-frame-options-type-tool 2026-11-12 12:45:20 -08:00
Dylan M. Taylor 213f3b75a3 Report recovery writes owned by another session 2026-11-12 15:43:43 -05:00
Dylan M. Taylor 1f2900fb50 Merge main into baseline grid justification PR 2026-11-12 15:29:33 -05:00
Dylan M. Taylor 3ebeb2ac96 Merge pull request #2669 from dotCooCoo/feat/object-style-text-frame-options
Object styles: a style sets its frames' paragraph styles and Text Frame General Options
2026-11-12 15:25:59 -05:00
Dylan M. Taylor 6790d009fe Merge pull request #2651 from dotCooCoo/fix/placed-image-resolution
Place: images come in at the resolution stored in the file
2026-11-12 15:25:55 -05:00
dotCooCoo e05d943d23 Merge main into fix/bottom-aligned-text-wrap 2026-11-12 12:24:22 -08:00
dotCooCoo 8121bca1fe Merge main into fix/effect-damage-bounds 2026-11-12 12:24:21 -08:00
dotCooCoo 963dc57d3b Merge main into feat/text-frame-options-type-tool 2026-11-12 12:23:08 -08:00
dotCooCoo 07728ede66 Merge main into fix/recovery-off-interface-thread 2026-11-12 11:26:06 -08:00
FredApps 1c3552de8b Merge pull request #2699 from dotCooCoo/fix/typing-recomposes-edited-part
Compose: an edit composes only the paragraphs it can change
2026-11-12 20:11:53 +01:00
dotCooCoo 2aa93ea807 Text: Text Frame Options from the Type tool show the inset of the frames they change
The one Inset field of a non-rectangular frame and the inset link now
follow the frames the dialog changes: the frame that shows the caret,
or every frame holding selected text. Before, a caret with no stored
frame showed four sides for an oval frame, and the link checked every
frame of the story.
2026-11-12 11:10:13 -08:00
dotCooCoo 75d1119def Text: Text Frame Options previews go from their document, and Undo refuses stored frames
A preview remembers the document it is shown in. When OK is refused or
Cancel is chosen after another document became active, that document
goes back as it was instead of keeping the previewed options.

The frames taken from the caret or selected text are also refused once
the document has changed after the dialog opened. Undo puts back the
document's id counter, so a frame made after Undo can take a stored id.
2026-11-12 10:59:49 -08:00
dotCooCoo cc7f289187 Merge main into fix/bottom-aligned-text-wrap 2026-11-12 10:50:05 -08:00
dotCooCoo 8134e00ece Merge main into fix/effect-damage-bounds 2026-11-12 10:49:55 -08:00
Codex fe631061db Use mutable row iteration in render fixture 2026-11-12 19:49:14 +01:00
Codex b5fad8e858 Use mutable subpath iteration for current Clippy 2026-11-12 19:45:08 +01:00
Codex 2a2d73ead9 Merge main preserving incremental composition and alpha-wrap caching 2026-11-12 19:41:39 +01:00
FredApps 113d196168 Merge pull request #2668 from dotCooCoo/fix/feathered-inner-effects
Render: a feathered object's bevel and inner effects fade with it
2026-11-12 19:40:26 +01:00
FredApps 17b74601fb Merge pull request #2663 from dotCooCoo/feat/alpha-channel-text-wrap
Text Wrap: Alpha Channel contours follow a transparent image's visible pixels
2026-11-12 19:38:50 +01:00
FredApps e9cc26df8a Merge pull request #2664 from dotCooCoo/feat/type-shortcuts-carry
Type: Justify All Lines ⇧⌘F, Em Space ⇧⌘M, En Space ⇧⌘N and Paragraph Rules ⌥⌘J
2026-11-12 19:31:45 +01:00
dotCooCoo 6446622464 Merge main into feat/object-style-text-frame-options 2026-11-12 10:14:11 -08:00
dotCooCoo d9afe26fc8 Merge main into feat/type-shortcuts-carry 2026-11-12 10:10:51 -08:00
autocraft-bot[bot] 99da9632b3 Merge main into feat/text-frame-options-type-tool 2026-11-12 18:05:59 +00:00
dotCooCoo f0e63b333d IDML: a style without a category flag takes it from its based-on style
An object style that gives neither EnableStrokeAndCornerOptions nor
corners of its own takes the category from the style it is based on, and
one without EnableTextFrameGeneralOptions does the same for its text
frame options. A style based on [None] still sets neither, and [None]
keeps the corners it sets itself.
2026-11-12 10:01:16 -08:00
FredApps f5f7084fc3 Merge pull request #1845 from dotCooCoo/feat/table-go-to-row
Tables: Table › Go to Row… selects a row by its number
2026-11-12 18:58:57 +01:00
dotCooCoo 737fcfec04 IDML: an item without corners keeps none over its object style
Object styles now export their corners, and an import gives an item
without corner attributes the corners of its style chain and of [None].
An item with no corners whose style, a style it is based on, or [None]
sets corners now writes None for each corner, so it keeps no corners
after export and import. The lookup runs once per style.
2026-11-12 09:53:54 -08:00
autocraft-bot[bot] f82f147127 Merge pull request #2703 from dotCooCoo/fix/text-frame-inset-link-mixed
Text Frame Options: link the insets only when every selected frame has even sides
2026-11-12 17:51:29 +00:00
dotCooCoo b0f282f607 Object styles: the dialog changes only the document it opened for
New Object Style and Object Style Options record the document they open
on, with the epoch that File > Revert changes. OK is refused, and the
dialog stays open with the reason, when another document is active, the
document was closed, or it was reverted. Apply Style to Selection applies
the new style to the objects selected when the dialog opened that still
exist, not to a selection made while it was open.
2026-11-12 09:40:38 -08:00
autocraft-bot[bot] 8ee3c1f7d0 Merge main into fix/text-frame-inset-link-mixed 2026-11-12 17:34:04 +00:00
dotCooCoo a8656662e9 Compose: vertical justification looks up each wrap's anchored object once
The object anchored at each story byte is indexed once per column, and each wrap's object is found once, not once for every line.
2026-11-12 09:29:14 -08:00
dotCooCoo 48ebdd9ffc Merge main into fix/bottom-aligned-text-wrap
Center and Bottom take the least room any line has above a wrap under it,
measured from the baseline as main now measures the bottom of the text.
Justify checks each row's room together with main's outline and area checks
in one search, so shaped-frame containment and wrap clearance hold together.
The Bottom tests now expect the last baseline on the text area's bottom.
2026-11-12 09:24:37 -08:00
FredApps fa671a104c Preserve latest incremental-composition documentation 2026-11-12 18:15:44 +01:00
dotCooCoo 2c0121aebb Text: Text Frame Options from the Type tool stay with their document
The dialog stores the frames it took from the caret or selection with
the document state they came from. OK and Preview are refused when
another document became active after the dialog opened, or when Revert
replaced the document, since the stored frame ids can name a different
frame there.
2026-11-12 09:14:42 -08:00
FredApps 3bdae7cec1 Merge main and preserve PR #2668 behavior 2026-11-12 18:14:28 +01:00
FredApps 2348380198 Merge main and preserve PR #2663 behavior 2026-11-12 18:14:28 +01:00
FredApps 268f432385 Merge main and preserve PR #2699 behavior 2026-11-12 18:14:28 +01:00
Codex 7f8b352196 Merge main and retain shortcut and preflight documentation 2026-11-12 18:13:30 +01:00