Commit Graph
2574 Commits
Author SHA1 Message Date
aiongg 2529a433a0 Merge PR #8371: Fix compound layer property exports in the reference app actions
docs/gaps.md: header line kept from main with the PR's change entry prepended; the PR's change-log row placed above main's 2026-10-21 row.
2026-10-22 02:24:10 +00:00
aiongg 51606201ac Merge PR #3698: feat: animate zoom
crates/ui-egui/src/canvas.rs: crop-camera block and paint_canvas call take the PR's display_view easing; the overlay-while-panning guard (`panning`, `if primary`) is main's, replacing the PR's hand_pan && dragged condition.
2026-10-22 02:24:09 +00:00
aiongg f271b0e07d Merge PR #7051: Save: ask before replacing a file that an added or lowercased extension names 2026-10-22 02:24:07 +00:00
aiongg b2ae473eab Merge PR #6415: Save for Web: Width, Height, Percent and Resample in Image Size, linked in proportion (#6388) 2026-10-22 02:24:04 +00:00
aiongg 3db9314ca2 Merge PR #6265: Codecs: save Cineon (.cin) film frames
apps/photocraft/src/services.rs: SAVE_FILTERS keeps the DDS entry from main and the PR's Cineon entry.
crates/codecs/README.md: Cineon table row from the PR (read and write), then main's DICOM and Amiga IFF rows.
crates/codecs/src/format.rs: caps keep the PR's Cineon (read and write) and main's Dicom and Iff rows.
crates/codecs/src/lib.rs: encode keeps the PR's Cineon arm and main's Dicom and Iff arms.
docs/file-format-parity.md: header kept from main with the Cineon write item added; Cineon / DPX row from the PR, DICOM row from main; the PR's change-log line added once at the top.
docs/gaps.md: header kept from main with the Cineon write item added; Missing list without 'Cineon write'; the PR's Cineon progress line replaces main's read-only one; the PR's change-log line added once at the top.
2026-10-22 02:24:03 +00:00
aiongg 8882086fd1 Merge PR #8232: Plug-ins: a reduced live preview scales the settings a manifest marks "unit": "px" (#7524) 2026-10-22 02:24:02 +00:00
aiongg bf1000302d Merge PR #8367: Layers: per-layer XMP metadata (layer.xmpMetadata), stored as the reference app stores it
docs/file-format-parity.md: kept main's PSD row (45 smart filters) and added the PR's layer XMP packet phrase.
2026-10-22 02:23:45 +00:00
aiongg 8f1a8f4f34 Merge PR #8242: Keep Batch results when the action saves and then closes the document
docs/gaps.md: header line kept from main with the PR's change entry prepended and date 2026-10-21; the PR's Done entry and change-log row placed above main's 2026-10-19 ones.
2026-10-22 02:23:34 +00:00
aiongg da305e0c7d Merge PR #5566: fix(ui): keep Character and Paragraph defaults editable before typing
crates/ui-egui/src/tool_reset.rs: main's PaintBucket line (no sample_all_layers) with the PR's Type arm (adds type_style_defaults).
crates/ui-egui/src/type_tool.rs: the PR's styles_at fallback to default_styles, plus main's type_unit line.
docs/gaps.md: header and change-log lines of both (header from main), G9 progress entries of both.
docs/ui-parity.md: header from main, change-log lines of both.
2026-10-22 02:23:26 +00:00
aiongg 2150493f3c Merge PR #7853: Brush: with airbrush build-up on, number keys set Flow and Shift+number sets Opacity (#7785) 2026-10-22 02:23:21 +00:00
aiongg c76bae7f03 Merge PR #5635: Animated WebP: every frame loads into video layers (#1198)
docs/file-format-parity.md: header line kept from main with the animated WebP item added in front; BMP row from main; WebP row from main plus the PR's animation sentence; the PR's change-log line added once, above the first 2026-10-14 row.
2026-10-22 02:23:20 +00:00
aiongg 72654dbb09 Merge PR #8236: Add interactive drag positioning to print preview 2026-10-22 02:23:14 +00:00
aiongg 35a6222e35 Merge PR #6227: Separate shortcut capture checks from native snapshot rendering 2026-10-22 02:23:09 +00:00
aiongg d1534bbf2c Merge PR #5365: Brush Settings: expose section lock names, state and focus
docs/brush-parity.md: kept main's header and added the PR's change item; the PR's change-log row added.
docs/gaps.md: kept main's header and added the PR's change item; the PR's G4 progress note and change-log row added.
2026-10-22 02:23:09 +00:00
aiongg 11c3f1ec92 Merge PR #5180: Type tool: click a path to start type on it (TYPE-218-1, #218)
contributors/people.toml: union of both sides' entries.
crates/ui-egui/src/canvas.rs: main's Move cursor (arrow) plus the PR's Type path-cursor arm.
crates/ui-egui/src/type_tool.rs: main's has_transform in draw_overlay; the PR's earlier `shape` binding kept, the duplicate binding dropped.
crates/ui-egui/src/vector_ui.rs: main's draw_overlay (paths already show with any tool), the PR's vector_tool line dropped.
docs/gaps.md: header line from main, G8 text from main with the click-on-path clause, change-log lines of both.
2026-10-22 02:22:58 +00:00
aiongg 96cce9b2f9 Merge PR #4713: Codecs: open Amiga IFF/ILBM bitmaps read-only
apps/photocraft-web/src/web.rs: OPEN_EXTS kept main's list (with the DICOM extensions) and added iff, lbm, ilbm.
apps/photocraft/src/services.rs: OPEN_EXTS kept main's list (with the DICOM extensions) and added iff, lbm, ilbm.
crates/codecs/README.md: kept both the DICOM and the Amiga IFF table row and section.
crates/codecs/src/format.rs: kept both the Dicom and the Iff variants in every match, detect runs the DICOM check then the IFF check, Format::ALL length re-counted (22).
crates/codecs/src/lib.rs: one use line importing dicom and iff; both decode and encode arms kept.
docs/gaps.md: header line kept from main, with the PR's 'Cineon and Amiga IFF read' wording.
2026-10-22 02:22:54 +00:00
aiongg c08a6ad9cf Merge PR #5317: Brush Pose: preserve independent Tilt X/Y overrides
crates/paint/src/brush_tests.rs: both sides added tests at the same spot; kept main's four smoothing tests and added the PR's three pose_axes tests after them.
docs/brush-parity.md: kept main's header and added the PR's change item.
docs/gaps.md: kept main's header, added the PR's change item; G4 progress notes and the change-log row kept from both sides.
docs/control-protocol.md: kept main's eyedropper line (with the document.sampleColor wording) and added the PR's Brush Pose line before it.
2026-10-22 02:22:51 +00:00
aiongg 46b1cda2d6 Merge PR #7621: Play .atn steps that switch to another open document
crates/engine/src/atn_cmds.rs: three hunks, kept both sides (the Mn menu-item mapping and zoom ids from main, the Dcmn offset mapping and document.activate id from the PR); the document.activate arm precedes main's menu-item fallback in select_to.
docs/gaps.md: header line kept from main with the PR's change entry prepended and the date 2026-10-19.
2026-10-22 02:22:50 +00:00
aiongg 029e97951f Merge PR #6389: Print: Functions › Bleed (corner crop marks on the trim line)
crates/engine/src/print_cmds.rs: kept main's result fields and the printServer/spooler/backend parameter text, added the bleed field and the bleed parameter text (two hunks).
crates/engine/src/print_cmds/tests.rs: both sides' appended tests kept whole.
docs/target-app-parity.md: header from main with the Bleed item added; change-log rows from both sides, newest first.
2026-10-22 02:22:34 +00:00
aiongg 96cc40a362 Merge PR #8270: docs(support): Canvas Size added a white border around my photo 2026-10-22 02:22:21 +00:00
aiongg 1f01abeebe Merge PR #7808: Add a draggable center diagram for Radial Blur Zoom 2026-10-22 02:22:16 +00:00
aiongg 2bf3e4e0be Merge PR #5470: feat(tiff): a tiffCompression option for scripted TIFF saves
crates/engine/src/file_cmds/tests.rs: both sides' appended tests kept whole.
docs/file-format-parity.md: header line keeps ours plus the PR's change item, date 2026-10-18; TIFF row has both notes; change-log rows kept both, newest first.
2026-10-22 02:22:15 +00:00
aiongg 7b9011ca33 Merge PR #8252: docs(architecture): drop references to the removed rust-framework-options.md 2026-10-22 02:22:15 +00:00
aiongg b09232adb1 Merge PR #8188: docs(parity): Crop rows in ui-parity.md match the code and the scorecard (#6562)
docs/ui-parity.md: header Change line kept ours (newer items) and the PR's Crop item added once at the front; revision-history row from the PR kept.
2026-10-22 02:22:15 +00:00
aiongg ae539ac9a9 Merge PR #5199: Brush Settings: disable Wetness/Mix controls outside Mixer Brush
docs/brush-parity.md: kept main's header, added the PR's change item and its newer date.
docs/gaps.md: kept main's header, added the PR's change item; change-log row appended after main's rows.
2026-10-22 02:22:13 +00:00
aiongg cce5208c2a Merge PR #7167: fix(ui): right-click an Adaptive Wide Angle constraint for its orientation menu, as in the reference app 2026-10-22 02:22:09 +00:00
aiongg 2a277af23c Merge PR #5062: fix(i18n): Italian Screen blend mode is "Scherma", not "Schermo"
contributors/people.toml: union of both sides' new entries.
2026-10-22 02:22:06 +00:00
aiongg 5947f4c69f Merge PR #6295: Smart Filters: Delete/Backspace removes the selected filter, not its smart object (#4751)
docs/ui-parity.md: header line kept from main, plus this PR's change-log entry once, first.
2026-10-22 02:21:56 +00:00
aiongg 6afb66de55 Merge PR #3775: Control protocol: document.pixel / document.sampleColor reply ranges (#3666)
docs/control-protocol.md: kept main's table rows (document.inspect with snapshots, layer.list) and added the PR's four-floats wording to document.pixel.
2026-10-22 02:21:55 +00:00
aiongg e8c68586c6 Merge PR #5644: Layer Mask Display Options: set the layer mask rubylith's colour and opacity
docs/scorecard.md: kept ours (regenerated at combine).
2026-10-22 02:21:54 +00:00
aiongg 7b50fbd796 Merge PR #4315: Codecs: open uncompressed DICOM single-frame images (#1048)
apps/photocraft-web/src/web.rs: OPEN_EXTS kept main's list and added dcm, dicom, dc3 after cin.
apps/photocraft/src/services.rs: OPEN_EXTS kept main's list and added dcm, dicom, dc3 after cin.
2026-10-22 02:21:52 +00:00
aiongg db6fc62d58 Merge PR #3565: M11: ten more acceptance tasks (21-30) in a second file for FILE-216-6 2026-10-22 02:21:46 +00:00
aiongg 200206f56b Merge PR #4392: Layer Style: user contour library with New…, Load/Replace/Save Contours (#4391) 2026-10-22 02:21:46 +00:00
aiongg daeccbb3c3 Merge PR #5064: docs(perf): how to measure one scenario and read its numbers 2026-10-22 02:21:45 +00:00
aiongg 3458eee861 Merge main into #3283
dialogs.rs: main's Displace-map prompt runs before the fallible confirm_command. filter_dialog.rs: main's ask_displace_map uses the new confirm_command signature; SMART_FILTER_SET_PARAMS stays for main's uses; a smart-filter edit without a "layer" param previews the active layer, as the command runs it (main's smart_displace_preview_uses_the_map_document).
2026-10-22 02:16:49 +00:00
Khawar Zamman WaniandClaude Opus 5.5 b2f4cb56fb Merge remote-tracking branch 'origin/main' into fix/6501-multi-layer-free-transform
Main replaced MAX_TRANSFORM_PIXELS with a memory budget from Preferences
(#7807); keep that and this branch's multi-layer helpers above it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 07:20:48 +05:30
Khawar Zamman WaniandClaude Opus 5.5 93ea5c12da Merge remote-tracking branch 'origin/main' into save-for-web-webp
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 06:28:54 +05:30
Khawar Zamman WaniandClaude Opus 5.5 1f63edd1b6 Merge remote-tracking branch 'origin/main' into hand-tool-modifier-zoom
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 06:28:54 +05:30
Khawar Zamman WaniandClaude Opus 5.5 df0b3e63cc Merge remote-tracking branch 'origin/main' into field-wheel-5473
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 06:28:54 +05:30
Khawar Zamman WaniandClaude Opus 5.5 fb12ed9322 Merge remote-tracking branch 'origin/main' into fix/marching-ants-device-pixels
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 06:28:53 +05:30
Khawar Zamman WaniandClaude Opus 5.5 85a1c26950 Merge remote-tracking branch 'origin/main' into pen-path-operations
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 06:28:28 +05:30
jonathnwxh 2ba33c4400 Merge main preserving document and View menu action mappings 2026-10-22 08:58:01 +08:00
jonathanwxh-cell e7bf017502 Merge main into batch save-point fix, retaining both regression suites 2026-10-22 07:47:27 +08:00
JGF 87a066ad53 Refresh adjustment clipping PR and align progress dates 2026-10-21 19:41:41 -04:00
vangel76andClaude Sonnet 5.5 c53463344f Merge upstream/main into fix/3290-filter-mask-paint
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-22 00:46:37 +02:00
David MannandClaude Opus 5.5 8905fdccca Integration: .asl gets its own Open filter, type.fillPath is a vector path (#4049, #6230)
- main's every_open_format_has_its_own_filter needs a named File › Open filter for every format:
  .asl (#4049) gets "Styles", as in Photoshop.
- main's registry_filesystem_path_params_are_classified read type.fillPath's "path" (#6230) as a
  host file; it is a document vector path, like type.attachToPath.
- docs: Type scorecard 5 / 4 / 1 in target-app-parity.md, 49 mapped smart filters in the scorecard.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 00:22:00 +02:00
aiongg f32f882f3a Merge main into integration-10
# Conflicts:
#	apps/photocraft-web/src/web.rs
#	apps/photocraft/src/services.rs
#	crates/engine/src/file_cmds/tests.rs
#	crates/engine/src/float_cmds.rs
#	crates/engine/src/float_cmds/tests.rs
#	xtask/src/corpus.rs
#	xtask/src/corpus_pins.rs
#	xtask/src/main.rs
2026-10-21 21:56:26 +00:00
aiongg c71322043c Merge PR #7941: Light themes outline the slider knob (UI-217-11, #7927) 2026-10-21 21:56:21 +00:00
aiongg e4a413241a Merge PR #8004: Windows on ARM: auto picks DirectX 12 for Qualcomm graphics (#7537) 2026-10-21 21:56:21 +00:00
aiongg c865e3b93b Merge PR #5928: BMP export: Indexed Color documents save as palette BMPs 2026-10-21 21:56:20 +00:00