fix,feat: canvas followups 12 #6884

psychedelicious · 2024-09-19T08:21:36Z

Summary

Fixes

Do not add canvas intermediates to boards
Do not show intermediates for board thumbnails
Do not count intermediates in board totals
Disable canvas hotkeys when viewer is open
Node execution states (i.e. the status of individual nodes in a workflow) not updating while running graph
Minor translation fixes

Enhancements

Revised canvas zoom UI & hotkeys (same as affinity/PS: mod+0 for fit, mod+1/2/3/4 for 100%/200%/400%/800%)
Cleaned up canvas toolbar (zoom buttons, fit buttons, added undo/redo buttons)
Removed auto-save canvas setting
Add simple swatches to color picker menu
Add d hotkey to set color to white (mirrors similar functionality in affinity/PS, though it doesn't match 1-to-1)
Show alert on viewer while staging
Add "New Canvas from Image" to image context menu
Differentiate "Add Layer" and "Add Layer of Type" icons - "Add Layer" is unchanged (plus sign), "Add Layer of Type" is a rectangle, similar to the icon in affinity/PS
Reworked send-to toggle* design, and it is disabled while staging
Canvas metadata recall

*Pending offline discussion

Related Issues / Discussions

n/a

QA Instructions

Try it out

Merge Plan

n/a

Checklist

The PR has a short but descriptive title, suitable for a changelog
Tests added / updated (if applicable)
Documentation added / updated (if applicable)

rebase

This setting's interactions with canvas were unintuitive and at odds with the modal nature of canvas v2 generations.

This mirrors affinity/photoshop's default `d` hotkey, which sets the fg/bg to white/black. We don't have a concept of "background color", and white is more useful for control images, so it sets to white.

- Add buttons to zoom in/out - Update hotkeys for fit & 100% to match affinity (e.g. ctrl+0, ctrl+1) - Add hotkeys for 200%, 400%, 800% - Update tooltips

Also update the verbiage for the alerts: - "Sending to Canvas" -> "Staging Generations on Canvas" - "Sending to Gallery" -> "Sending Generations to Gallery"

…er buttons

- Renamed "Send to Canvas" -> "New Layer from Image" - Added "New Canvas from Image" This clarifies the purpose of the menu items and gives tablet users a way to easily add images tot he canvas.

…lt-in narrowing

- Add async zod refiner to `zImageWithDims` which fetches the image as part of validation - Add `zServerValidatedModelIdentifierField`, a zod-refined version of `zModelIdentifierField` which fetches the model as part of validation - Add `zCanvasMetadata` zod schema, which contains only canvas entities - no bbox, and no `isHidden` flags

- Allow `uploadImage` util to accept `metadata` to embed in the image - Update compositor to support `metadata` field when uploading rasterized composite layer

- Add parser, recaller and handler - Add redux action to rehydrate the whole shebang at once

We must ignore the cache when validating metadata, else a recently-deleted image may still be cached and we get erroneously successful validation.

whoops

Fixes an issue where indeterminate progress wasn't shown.

…y nav

psychedelicious requested review from blessedcoolant, maryhipp, hipsterusername and brandonrising as code owners September 19, 2024 08:21

github-actions bot added python PRs that change python files services PRs that change app services frontend PRs that change frontend files labels Sep 19, 2024

hipsterusername approved these changes Sep 19, 2024

View reviewed changes

psychedelicious force-pushed the psyche/canvas-followups-12 branch from 31a7691 to b4f8e4b Compare September 19, 2024 13:02

psychedelicious enabled auto-merge (rebase) September 19, 2024 13:02

psychedelicious disabled auto-merge September 19, 2024 13:06

psychedelicious added 19 commits September 19, 2024 23:17

fix(ui): do not add save-to-canvas generations to board

90a71cd

rebase

feat(ui): remove auto-save canvas setting

759b87b

This setting's interactions with canvas were unintuitive and at odds with the modal nature of canvas v2 generations.

feat(ui): save staged image to gallery saves to the selected board

fc1b7b3

fix(app): do not show intermediate images for board thumbnail

1dd51c8

fix(app): exclude intermediate images from board image count

b2a35b1

feat(ui): toolbar layout

3e5a9f3

fix(ui): disable canvas hotkeys when viewer is open

c9f272e

feat(ui): add swatches to color picker

471061d

feat(ui): add d hotkey to set fill color to white

a6fc96f

This mirrors affinity/photoshop's default `d` hotkey, which sets the fg/bg to white/black. We don't have a concept of "background color", and white is more useful for control images, so it sets to white.

feat(ui): rework canvas zoom UI in toolbar

375635a

- Add buttons to zoom in/out - Update hotkeys for fit & 100% to match affinity (e.g. ctrl+0, ctrl+1) - Add hotkeys for 200%, 400%, 800% - Update tooltips

feat(ui): tweak toolbar layout

96a6386

feat(ui): tweak toolbar layout more

89631e9

fix(ui): "redo" -> "Redo"

6af4b45

feat(ui): add dedicated undo/redo buttons to canvas toolbar

5b67977

feat(ui): show alert on viewer when staging on canvas

f606a3a

Also update the verbiage for the alerts: - "Sending to Canvas" -> "Staging Generations on Canvas" - "Sending to Gallery" -> "Sending Generations to Gallery"

feat(ui): reworked send-to toggle

5490151

feat(ui): differentiate add layer menu buttons and add individual lay…

490db78

…er buttons

feat(ui): add "new canvas from image" to image context menu

d95684f

- Renamed "Send to Canvas" -> "New Layer from Image" - Added "New Canvas from Image" This clarifies the purpose of the menu items and gives tablet users a way to easily add images tot he canvas.

fix(ui): node execution states not updating during generation

de8c984

psychedelicious added 16 commits September 19, 2024 23:17

fix(ui): missing translation on node footer

e94a46b

chore(ui): lint

22f91ed

tidy(ui): do not use zod validator in image usage util - just use bui…

60b755a

…lt-in narrowing

feat(ui): embed canvas metadata in send-to-gallery generations

16b4a25

feat(ui): support embedding metadata when rasterizing composite layer

6c4c77e

- Allow `uploadImage` util to accept `metadata` to embed in the image - Update compositor to support `metadata` field when uploading rasterized composite layer

feat(ui): support recalling canvas metadata

0ae8af7

- Add parser, recaller and handler - Add redux action to rehydrate the whole shebang at once

fix(ui): force refetch of image when validating metadata

3e2beb0

We must ignore the cache when validating metadata, else a recently-deleted image may still be cached and we get erroneously successful validation.

fix(ui): do not hide entities when locked

559384f

whoops

fix(ui): re-render tool when entity interaction state changes

3ab5ff0

fix(ui): overflow on smaller screens

65f1432

fix(ui): clear last progress event on invocation/queue item complete

2c6166c

Fixes an issue where indeterminate progress wasn't shown.

feat(ui): style send-to toggle like it was previously

3f74095

feat(ui): lock down bbox while staging

167f225

fix(ui): mixed up gallery nav hotkeys

dcb116f

fix(ui): use updated algo to calc images per row in gallery for hotke…

d6e9153

…y nav

psychedelicious force-pushed the psyche/canvas-followups-12 branch from b4f8e4b to d6e9153 Compare September 19, 2024 13:18

psychedelicious merged commit 13db18f into main Sep 19, 2024
14 checks passed

psychedelicious deleted the psyche/canvas-followups-12 branch September 19, 2024 13:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix,feat: canvas followups 12 #6884

fix,feat: canvas followups 12 #6884

psychedelicious commented Sep 19, 2024

fix,feat: canvas followups 12 #6884

fix,feat: canvas followups 12 #6884

Conversation

psychedelicious commented Sep 19, 2024

Summary

Fixes

Enhancements

Related Issues / Discussions

QA Instructions

Merge Plan

Checklist