Merge main into feat/align-selected-lines

Browse Source

Main moved to egui 0.37 (#4591) and took the menus change (#4752).
Conflicts:
- edit_text_ui.rs: the paragraph box keeps the shared input id, now
  Id::unique; the added-text box's shared id and the unit tests' ids
  follow.
- content_ui.rs: the added-text box keeps its per-paragraph layouter
  (which places each line itself, so main's .align(halign) is left out)
  and takes main's inset, margin(4, 2), and its "Added text"
  accessibility label.

...

This commit is contained in:

RiceDee

2026-10-26 21:02:08 +11:00

parent e6e57a9a07 64e0868b84

commit a33a8bba38

230 changed files with 15375 additions and 3301 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

parity/acrobat-features.toml

+29 -29

File diff suppressed because one or more lines are too long