Commit Graph
5847 Commits
Author SHA1 Message Date
aiongg b119da85cb Merge PR #7801: Refuse strict .atn export of an in-place layer duplicate
contributors/people.toml: both sides appended a person; kept both.
2026-10-22 02:23:00 +00:00
aiongg 2d74af4c8e Merge PR #7721: fix(actions): refuse lossy fractional Crystallize ATN export
crates/engine/src/atn_cmds.rs: kept main's fields_from/fields_to doc comments and range-checked Kind::Long arm; one ExactLong definition (main's); Ripple Amnt stays ExactLong and Crystallize ClSz becomes ExactLong.
2026-10-22 02:22:59 +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 ed69a40204 Merge PR #8257: test(algo): cover deinterlace choices and NTSC signal limits 2026-10-22 02:22:58 +00:00
aiongg c013fa29d4 Merge PR #5888: Pen options bar: Make Selection in Path mode (#5703) 2026-10-22 02:22:57 +00:00
aiongg 86ff9317c0 Merge PR #8187: fix(ui): a unit after a range bound in a params doc no longer resets the dialog range (part of #7598) 2026-10-22 02:22:57 +00:00
aiongg ec1c38dfd1 Merge PR #8128: Liquify: keep short strokes whole so undo removes only the last
crates/ui-egui/src/liquify_ui.rs: tests appended by both sides (zoom tests from #7227 and this PR's stroke tests), both kept whole.
2026-10-22 02:22:56 +00:00
aiongg 8d989c4571 Merge PR #7894: Slice Select: Delete deletes the selected slice, not the layer (#7862)
crates/ui-egui/src/slice_ui.rs: tests appended by both sides; kept both whole.
2026-10-22 02:22:55 +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 0cafffbfcd Merge PR #7161: i18n(zh-hans): translate the 14 counted status messages missing from Simplified Chinese 2026-10-22 02:22:54 +00:00
aiongg 5b08c0ce79 Merge PR #7811: Preferences › Raw Defaults › Resolution: a developed raw opens at it (#7789)
docs/scorecard.md: ours (regenerated at combine).
2026-10-22 02:22:53 +00:00
aiongg 0fa9f075df Merge PR #8173: Layers panel: mark adjustment layers kept as imported but not rendered (#6541) 2026-10-22 02:22:51 +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 e752bb2ec8 Merge PR #6661: fix(print): preserve WinAnsi characters in PDF labels
contributors/people.toml: both sides' new rows kept.
crates/engine/src/print_cmds/tests.rs: both sides' appended tests kept whole.
2026-10-22 02:22:51 +00:00
aiongg a53c1ed1d7 Merge PR #7759: Actions: a setting the reference app's event cannot hold refuses the step
crates/engine/src/atn_cmds.rs: the filter macro's to guard keeps both checks (pixel_target && !skip && holds_its_settings); kept main's preserves_roundness and the PR's UNHOLDABLE table and holds_its_settings.
crates/engine/src/atn_cmds/tests.rs: kept both sides' tests whole.
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 334636fc1e Merge PR #8085: Preferences › File Handling: Do not append "copy" to filename when saving a copy (#8080)
docs/scorecard.md: ours (regenerated at combine).
2026-10-22 02:22:50 +00:00
aiongg 5f67e5da81 Merge PR #8030: Layers panel: a group's layers indent past the group (#8017)
crates/ui-egui/src/panels.rs: layer_row: kept main's thumbnail-size lines (base == 0 case) and applied the PR's one-step indent through its own steps value.
2026-10-22 02:22:50 +00:00
aiongg aa4f03a8ad Merge PR #7571: Refuse strict .atn export of Apply Image with a blending mask
Conflicts:
crates/engine/src/atn_cmds/tests.rs: appended tests, kept both
2026-10-22 02:22:48 +00:00
aiongg 8c92678a30 Merge PR #7815: PNG: correct sTER eye-order names without changing stored bytes 2026-10-22 02:22:43 +00:00
aiongg 7c774bef43 Merge PR #7677: Export As: show the size the file will have (#6595)
crates/ui-egui/src/export_dialog.rs: the cache_preview call takes both sides' changes (main's filter argument, the PR's sig.clone()).
2026-10-22 02:22:43 +00:00
aiongg adf7e6ee8b Merge PR #7956: Align: a lone layer in an artboard aligns to that artboard 2026-10-22 02:22:42 +00:00
aiongg eedeacb36e Merge PR #8087: fix(liquify): include cubic overshoot in source reads
crates/algo/src/liquify.rs: apply_liquify keeps this PR's widened maxd and main's has_freeze line (both lines kept).
2026-10-22 02:22:40 +00:00
aiongg a805bbcb14 Merge PR #7932: Layers: the pointer over a thumbnail shows what Cmd-click loads, with the +/-/x badge (#7824)
crates/ui-egui/src/layer_shortcut_tests.rs: both sides appended a test at the end; kept both whole.
2026-10-22 02:22:40 +00:00
aiongg 683490f5de Merge PR #6445: Tests: every GPU test holds gpu_lock (fixes STATUS_ACCESS_VIOLATION crashes on Windows) 2026-10-22 02:22:34 +00:00
aiongg 37d7ff1b2e Merge PR #8097: i18n(pt-br): translate 131 runtime labels that still showed in English 2026-10-22 02:22:34 +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 a40972d80d Merge PR #7585: Refuse strict .atn export of a mask/channel-targeted Free Transform
Conflicts:
crates/engine/src/atn_cmds/tests.rs: appended tests, kept both
2026-10-22 02:22:32 +00:00
aiongg e1fde5bfa2 Merge PR #7930: perf(liquify): parallel dab nodes and source read, P30 −13–15 %, same pixels 2026-10-22 02:22:32 +00:00
aiongg 80071286af Merge PR #8114: Layers panel: a click on the empty space below the layers deselects them (#8100)
crates/ui-egui/src/layer_shortcut_tests.rs: both sides' appended tests kept whole.
2026-10-22 02:22:31 +00:00
aiongg b66199332f Merge PR #7588: fix(atn): refuse strict export of options the descriptors can't carry
crates/engine/src/atn_cmds.rs: kept this PR's range-checked Kind::Long arm and main's Kind::ExactLong arm; dropped the PR's Group Layers explicit-layer refusal (#7236), as #7968 exports that layer by name.
crates/engine/src/atn_cmds/tests.rs: kept both sides' tests whole; dropped the PR's groupLayers layer:3 refusal case (#7236).
2026-10-22 02:22:30 +00:00
aiongg 2121cfecd0 Integration: #7665 the near-one-second exposure test expects three significant digits
Main's test expected 0.996 s to print as "1 s" (two decimals); the PR prints three significant digits, so it reads "0.996 s". Still never "1/1 s".
2026-10-22 02:22:26 +00:00
aiongg 4054507e76 Merge PR #7919: Liquify: Alt-drag brush resize keeps the brush in place and no longer paints a dab (#7884) 2026-10-22 02:22:26 +00:00
aiongg b0c055c728 Merge PR #7624: Fade the alpha channel or Quick Mask an edit changed (#7382)
crates/engine/src/edit_menu_cmds.rs: fade(): kept main's checked_sub for the previous state and took the PR's FadeTarget-based surface_of lookups and messages.
2026-10-22 02:22:25 +00:00
aiongg 536a866e7c Integration: #7808 complete the RowGestures literal with ..Default::default() 2026-10-22 02:22:23 +00:00
aiongg 1e24b4d743 Merge PR #7593: Refuse .atn export of crops with output size or resolution
crates/engine/src/atn_cmds/tests.rs: both sides appended tests; kept both whole.
2026-10-22 02:22:22 +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 72ca30ab77 Merge PR #8269: contributors: add adi-1108
contributors/people.toml: both sides appended entries at the end; kept both (union).
2026-10-22 02:22:20 +00:00
aiongg e1492a75f4 Merge PR #7665: File Info: print a slow shutter speed as the fraction a camera writes
crates/engine/src/file_cmds.rs: exposure_text kept the PR's fraction rule and main's guard against "1/1 s" (n > 1.0 for exposures from 0.1 s to 1 s); the main test for it still holds.
2026-10-22 02:22:19 +00:00
aiongg 1e5866ebaf Merge PR #4567: Codecs: PCX runs may cross plane boundaries within a scanline
contributors/people.toml: union; main's new entries kept and the PR's webdevtodayjason entry appended.
2026-10-22 02:22:17 +00:00
aiongg 1cbeb4a784 Merge PR #7590: fix(atn): keep a Transform Selection's interpolation; refuse what the transform descriptor can't carry
Conflicts:
crates/engine/src/atn_cmds/tests.rs: appended tests, kept both
2026-10-22 02:22:16 +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 7b7628adaa Integration: #7204 outside-stroke paint composites as Normal in Dissolve mode (share carries the speckle; CPU and GPU agree) 2026-10-22 02:22:13 +00:00
aiongg f0252fee5c Merge PR #7227: Liquify: zoom the preview with the zoom keys, a trackpad pinch and ×1.1 wheel notches (#7210) 2026-10-22 02:22:12 +00:00
aiongg 67cb5ec9eb Merge PR #5131: i18n: translate missing Simplified Chinese tool labels 2026-10-22 02:22:10 +00:00
aiongg 916fc864c0 Merge PR #7109: Presets: the damaged-set test also covers Export As presets
crates/engine/src/presets/tests.rs: main's test already covered export_presets; kept main's setup and loop, added the PR's recent_documents key and its extra damaged/null assertions, dropped the PR's unconditional per-key export_presets assert (main's conditional one stays).
2026-10-22 02:22:10 +00:00