Skip to content

Toolbar: Tools menu, tool switcher, menu icons - #1368

Merged
marcinz606 merged 2 commits into
mainfrom
mz/tools
Oct 12, 2026
Merged

marcinz606 merged 2 commits into
mainfrom
mz/tools

Conversation

@marcinz606

@marcinz606 marcinz606 commented Oct 12, 2026 •

Copy link
Copy Markdown
Owner

Summary

  • Tools menu on the canvas toolbar (icon-only, between Flip and Undo). It lists every canvas tool that has a toolbar row, grouped under its panel section: Geometry, Metering, Filtration, Dodge & Burn, Retouch. Each item shows the sidebar icon and the key. An item runs the tool's own shortcut action, so the tool's tab opens and a gated tool shows grayed out. Zone Placement is not in the menu, because it arms only from the zone strip.
  • Tool switcher: when a tool is armed, its name on the tool row opens the same menu, so you go from Heal to Clone with no Done in between.
  • The ⋯ menu has a Tools submenu. A saved toolbar row gets Tools once, before Undo. If the user removes it, it does not come back (toolbar_added_items).
  • Overlays and Tools are icon-only. The Print and Overlays menu items now show icons. An item that is on shows its icon in the accent color, because the icon takes the place of the checkmark.
  • An "Open Tools menu" action in the shortcut registry, with no default key.
  • Fix: the Print menu grayed out Flat Scan until Flat output was on, but the peek works on any frame and the M key always worked.

Test plan

  • make all
  • Headless E2E on the real MainWindow: all 13 menu items arm their tools; Heal → Clone from the switcher arms Clone and turns the Heal sidebar button off; Flat Scan from the Print menu turns the peek on with Flat output off; the ⋯ Tools submenu is filled
  • make run: arm each tool from the menu, check the tab reveal and Done/Esc

Open

  • Heal and WB Picker use the same eye-dropper icon, and Transport Line and Card Edge both use grip-lines (these are the sidebar icons; the menu reuses them).

Every canvas tool has its own toolbar row, but it armed only from its
sidebar card or a key. Now:

- a Tools menu on the row lists them under their panel section
  (Geometry, Metering, Filtration, Dodge & Burn, Retouch), each with its
  sidebar icon and key; an item runs the tool's shortcut action, so its
  tab opens and a gated tool grays out
- the armed tool's name on its row opens the same menu, so Heal goes to
  Clone with no Done between them
- the ⋯ menu carries a Tools submenu
- a stored row gets Tools once, before Undo; a removed one stays removed
- Tools and Overlays are icon-only
- the Print and Overlays menus show their icons; an item that is on
  takes the accent, since the icon sits in the checkmark's place
- "Open Tools menu" shortcut action, unbound by default
The Print menu grayed out Flat Scan until Flat output was on in the
Export tab, yet the peek renders the flat master from any frame and its
key (M) always worked. The menu and the ⋯ item now match the key.
@marcinz606
marcinz606 merged commit a581c25 into main Oct 12, 2026
1 check passed
@marcinz606
marcinz606 deleted the mz/tools branch October 12, 2026 06:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant