Skip to content

Conversation

@psychedelicious
Copy link
Contributor

@psychedelicious psychedelicious commented Jun 1, 2023

Add ControlNet to the Linear UI (Text to Image & Image to Image tabs).

  • add a new collapsible component to the parameters panel for ControlNet
  • any number of ControlNets may be added
  • control images are automatically processed (if not marked as preprocessed)
  • a mini UI displays the control image as a thumbnail, weight and begin/end step %
  • toggle to advanced UI to see the control image much larger and access the processor settings

Other Changes

Enhanced drag and drop

  • add new library dnd-kit for drag and drop, much more capable than the previous implementation with native HTML Drag and Drop API
  • images and be dragged from anywhere to anywhere else (except you cannot drop onto gallery)
  • vastly simplifies internal logic for handling dragging images around
  • IAIDndImage component encapsulates logic for draggable and droppable images
  • should fix issues raised by @GreggHelt2 and @mickr777 regarding drag and drop

Misc

  • add alpha colours to theme eg accentAlpha.200, okAlpha.700
  • handful of minor bug fixes

TODO:

  • support arbitrary models (currently just the basic ones are hardcoded)
  • auto-select processor based on model

@GreggHelt2
Copy link
Contributor

I can verify that this PR fixes the problem with drag and drop of images in Chrome on Ubuntu. Huzzah!

@psychedelicious psychedelicious force-pushed the feat/ui/controlnet-ui branch 2 times, most recently from 6c9cb45 to b0be3c1 Compare June 4, 2023 12:02
@psychedelicious psychedelicious marked this pull request as ready for review June 4, 2023 12:08
@mickr777
Copy link
Contributor

mickr777 commented Jun 4, 2023

I can verify that this PR fixes the problem with drag and drop of images in Chrome on Ubuntu. Huzzah!

And on chrome windows

@psychedelicious psychedelicious force-pushed the feat/ui/controlnet-ui branch from b0be3c1 to 959307f Compare June 4, 2023 12:13
@psychedelicious psychedelicious force-pushed the feat/ui/controlnet-ui branch from 959307f to a676d35 Compare June 4, 2023 12:34
@psychedelicious psychedelicious enabled auto-merge (rebase) June 4, 2023 12:34
@psychedelicious psychedelicious merged commit 919b81c into main Jun 4, 2023
@psychedelicious psychedelicious deleted the feat/ui/controlnet-ui branch June 4, 2023 12:35
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.

5 participants