mirror of
https://github.com/storytold/designcraft.git
synced 2026-10-31 21:56:50 -06:00
Zinadin ZidanandClaude Opus 5.5
1afbc95900
Three files conflicted. In dialogs.rs both sides added code after doc_unit: the PR's doc_vertical_unit and frame_size_dialog stay, followed by main's reworded Create Guides doc comment. In dialogs/tests.rs both sides appended tests at the end of the file: all of main's tests stay and the PR's two Rectangle dialog tests follow them. In panels/properties/object.rs main now opens Corner Options from the Properties Corner link, so main's line is kept and the PR's change there (the Rectangle dialog through frame_size_dialog) is dropped, since that link no longer opens the Rectangle dialog. Follow-up beyond the conflicts: main added a Dialog struct literal for the Change Format dialog, which now also sets the PR's new vertical_unit field to None so the crate builds. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>