mirror of
https://github.com/storytold/photocraft.git
synced 2026-10-28 10:11:58 +01:00
Conflicts: the batch's wheel reads (#5547 Animated Zoom) keep their extra argument with main's ids (`Id::unique`, `ui.scope_id()`); crop presets keep #6620's `apply_choice` with main's accessible name; Bevel & Emboss keeps #9370's per-mode id with main's name argument; the Stroke field keeps #7203's gradients with main's name; tone.rs keeps #9139's move of the Histogram panel to histogram_panel.rs (main only renamed ids there); translation catalogs as unions. Not flagged by git, the batch's new code follows egui 0.37 too: dropdowns take an accessible name (Histogram Channel/Source #9139, tool Mode #5504, Art History Style #1610, New Snapshot From #3567), MouseWheel events carry `source`, `WidgetType` is `Role` (ColorButton is ColorWell, #7203), `Id::new`/`Ui::id` are `Id::unique`/`Ui::scope_id`. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>