Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix,feat: canvas followups 7 #6849

Merged
merged 23 commits into from
Sep 13, 2024
Merged

fix,feat: canvas followups 7 #6849

merged 23 commits into from
Sep 13, 2024

Conversation

psychedelicious
Copy link
Collaborator

@psychedelicious psychedelicious commented Sep 13, 2024 •
edited
Loading

Summary

Misc canvas followups:

  • Fix: Wrong translation used for transform's fit to bbox
  • Fix: Off-by-one error with layer z-index (unsure if it actually caused any problems)
  • Fix: Adjusting opacity during filtering causing empty image to be filtered
  • Fix: Ensure filtering is done with layer at opacity 1
  • Feat: Close viewer when sending gallery image to canvas
  • Feat: Disable progress images on canvas
  • Feat: Brighter border around fill color buttons
  • Feat: Upload button on control layer
  • Feat: Canvas interaction restrictions (e.g. no tools while staging, no undo/redo while transforming, etc etc)
  • Feat: Rename "Composite Masked Regions" -> "Output Only Masked Regions"
  • Feat: Show alert when selected layer is empty
  • Feat: Handle error conditions when sending to gallery
  • Feat: Add filter/transform/delete to canvas context menu
  • Feat: On-theme checkerboard pattern
  • Feat: Filter process button does immediate processing (before it had a delay)
  • Feat: Bbox has black and white outline (before was white only)
  • Feat: Regions start w/ no prompt or IP adapter
  • Internal: Revised Result type, docstrings, tidy

Related Issues / Discussions

Discord, offline discussions.

QA Instructions

Try it out.

Merge Plan

I will do a release after merging.

Checklist

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

@github-actions github-actions bot added the frontend PRs that change frontend files label Sep 13, 2024
@psychedelicious psychedelicious enabled auto-merge (rebase) September 13, 2024 12:31
@psychedelicious
feat(ui): close viewer on send image to canvas
988c718
@psychedelicious
feat(ui): add setting to disable progress images on canvas
42e1263
@psychedelicious
feat(ui): brighter border around fill color buttons
d4ddb97
@psychedelicious
feat(ui): select layer when dropping image on it to replace its data
f868d19
@psychedelicious
feat(ui): add upload button to control layer
51c46a5
@psychedelicious
fix(ui): wrong translation used for transform fit to bbox
50dbf74
@psychedelicious
feat(ui): revised canvas "busyness" state tracking
4cad712 
Track various canvas states:
- Filtering an entity
- Transforming an entity
- Rasterizing an entity
- Compositing
- Busy (derived from all of the above)

Also track individual entity states:
- Locked
- Disabled
- All of type are hidden
- Has objects
- Interactable (derived from all of the above)

These states then gate various actions. For example:
- Cannot invoke while the canvas is busy.
- Cannot transform, filter, duplicate, or delete when the canvas is busy.

Tool interaction restrictions are not yet implemented.
@psychedelicious
fix(ui): off-by-one layer zIndex
c0c51e3
@psychedelicious
fix(ui): set opacity to 1 when rasterizing for filter
42e1479
@psychedelicious
fix(ui): do not show/hide objects when filtering
cd99f4c 
This is a holdover from before the buffer renderer was split out.
@psychedelicious
feat(ui): more interaction restrictions
e9c9bee
@psychedelicious
feat(ui): global canvas hotkey interaction restrictions
fae9c5d
@psychedelicious
feat(ui): "Composite Masked Regions" -> "Output Only Masked Regions"
31d9bc7
@psychedelicious
feat(ui): show alert when selected layer is empty
02fce39
@psychedelicious
feat(ui): revised Result implementation
61bd13a 
Use classes with `isOk` and `isErr` methods instead of separate type guard functions. Update tests and usage.
@psychedelicious
docs(ui): update canvasToBlob docstring
c4efb48
@psychedelicious
feat(ui): handle errors when saving canvas to gallery
8c266e9
@psychedelicious
feat(ui): add filter/transform/delete to canvas context menu
f68db92
@psychedelicious
feat(ui): on-theme checkboard pattern colors
31d5293 
They were pure grayscale before. Now are tinted according to our base color.
@psychedelicious
feat(ui): filter process button does immediate processing
79bf0db
@psychedelicious
chore(ui): lint
5b5c906
@psychedelicious
feat(ui): bbox has black and white outline
6cd6dcc
@psychedelicious
feat(ui): region starts w/ no prompts or ip adapters
c78dd12
@psychedelicious psychedelicious merged commit 865f419 into main Sep 13, 2024
14 checks passed
@psychedelicious psychedelicious deleted the psyche/canvas-followups-7 branch September 13, 2024 12:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hipsterusername hipsterusername hipsterusername approved these changes

@blessedcoolant blessedcoolant Awaiting requested review from blessedcoolant blessedcoolant is a code owner

@maryhipp maryhipp Awaiting requested review from maryhipp maryhipp is a code owner

Assignees
No one assigned
Labels
frontend PRs that change frontend files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@psychedelicious @hipsterusername