Commit Graph

107 Commits

Author SHA1 Message Date
comfyanonymous 852cf4db99 Merge branch 'widget-input-overlapping' of https://github.com/ssitu/ComfyUI 2023-06-21 02:45:59 -04:00
ssit 6f54b01954 Fix reroute node connecting different types 2023-06-20 15:25:56 -04:00
ssit 8c3d24434a Fix overlapping when converting widgets to inputs 2023-06-20 12:03:46 -04:00
reaper47 96e8307bd3 Clean keybinds extension 2023-06-19 21:32:21 +02:00
reaper47 34ddbfdc8a Beautify settings dialog 2023-06-15 18:36:52 +02:00
reaper47 aba886e9da Issue 741: Darken white background 2023-06-13 08:27:26 +02:00
reaper47 3402ec0c0d Issue 752: Fix background 2023-06-12 15:58:05 +02:00
comfyanonymous b18946c53b Merge branch 'next-task' of https://github.com/reaper47/ComfyUI 2023-06-10 03:23:25 -04:00
reaper47 bfebe2d6c3 Improve ContextMenuFilter extension 2023-06-09 13:29:15 +02:00
comfyanonymous 4b0b516544 Add code to handle primitive nodes connected to reroute nodes.
Revert last commit because I noticed it broke a few things.
2023-06-09 02:49:13 -04:00
Dr.Lt.Data 8e14c46a38
allows connect primitive node to reroute if primitive node has type (#751)
Co-authored-by: Lt.Dr.Data <lt.dr.data@gmail.com>
2023-06-09 02:21:30 -04:00
space-nuko eed4f62cc5 Add comment support to dynamic prompts nodes 2023-06-08 12:08:00 -05:00
space-nuko b4f434ee66 Preview sampled images with TAESD 2023-06-05 09:20:17 -05:00
Dr.Lt.Data 9f3a19b728
improve: lightweight preview to reduce network traffic (#733)
* To reduce bandwidth traffic in a remote environment, a lossy compression-based preview mode is provided for displaying simple visualizations in node-based widgets.

* Added 'preview=[image format]' option to the '/view' API.
* Updated node to use preview for displaying images as widgets.
* Excluded preview usage in the open image, save image, mask editor where the original data is required.

* Made preview_format parameterizable for extensibility.

* default preview format changed: jpeg -> webp

* Support advanced preview_format option.
- grayscale option for visual debugging
- quality option for aggressive reducing

L?;format;quality?

ex)
jpeg => rgb, jpeg, quality 90
L;webp;80 => grayscale, webp, quality 80
L;png => grayscale, png, quality 90
webp;50 => rgb, webp, quality 50

* move comment

* * add settings for preview_format
* default value is ''(= don't reencode)

---------

Co-authored-by: Lt.Dr.Data <lt.dr.data@gmail.com>
2023-06-05 01:49:43 -04:00
Dr.Lt.Data 126b4050dc
Crash fix for intermittent crashes that occur when opening MaskEditor. (#732) 2023-06-03 12:25:49 -04:00
comfyanonymous bfb13f5eee Remove useless call to /object_info 2023-05-22 17:05:23 -04:00
comfyanonymous 13d94caf49 Add control_after_generate to combo primitive. 2023-05-16 03:18:11 -04:00
Dr.Lt.Data d926f65f56
Feature/maskeditor context menu (#649)
* add "Open in MaskEditor" to context menu

* change save button name to 'Save to node' if open in node.
clear clipspace_return_node after auto paste

* * leak patch: prevent infinite duplication of MaskEditorDialog instance on every dialog open
* prevent conflict of multiple opening of MaskEditorDialog
* name of save button fix

* patch: brushPreview hiding by dialog

* consider close by 'esc' key on maskeditor.

* bugfix about last patch

* patch: invalid close detection

* 'enter' key as save action

* * batch support enhance
  - pick index based on imageIndex on copy action
* paste fix on batch image node

* typo

---------

Co-authored-by: Lt.Dr.Data <lt.dr.data@gmail.com>
2023-05-14 10:21:22 -04:00
comfyanonymous a7ebd5aa12 Fix masked editor issue with firefox on windows. 2023-05-08 15:52:33 -04:00
comfyanonymous 850daf0416 Masked editor changes.
Add a way to upload to subfolders.

Clean up code.

Fix some issues.
2023-05-08 14:37:51 -04:00
Dr.Lt.Data ae08fdb999
Clipspace Menu and MaskEditor application. (#548)
* Add clipspace feature.
* feat: copy content to clipspace
* feat: paste content from clipspace

Extend validation to allow for validating annotated_path in addition to other parameters.

Add support for annotated_filepath in folder_paths function.

Generalize the '/upload/image' API to allow for uploading images to the 'input', 'temp', or 'output' directories.

* rename contentClipboard -> clipspace

* Do deep copy for imgs on copy to clipspace.

* mask painting on clipspace

* add original_imgs into clipspace
* Preserve the original image when 'imgs' are modified

* robust patch & refactoring folder_paths about annotated_filepath

* wip

* Only show the Paste menu if the ComfyApp.clipspace is not empty

* clipspace feature added
maskeditor feature added

* instant refresh on paste

force triggering 'changed' on paste action

* enhance mask painting

smooth drawing
add brush_size +/- button

* robust patch

use mouseup event

* robust patch

again...

* subfolder fix on paste logic

attach subfolder if subfolder isn't empty

* event listener patch

add ], [ key event for brush size
remove listener on close

* Fix button positioning issue related to window height.
Change brush size from button to slider.

* clean commit

* clean code

* various bug fixes

* paste action
- prevent opening upload popup
- ensure rendering after widget_value update

* view api update
- support annotated_filepath

* maskeditor layout
- prevent covering button by hidden div

* remove dbg message

* Add cursor functionality to display brush size

* refactor: Replace brush preview feature with missionfloyd implementation

* missionfloyd implementation
* hiding brush preview off the canvas
* change brush size on wheel event

* keyup -> keydown event

* Update web/extensions/core/maskeditor.js

Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>

* Add support for channel-specific image data retrieval in /view API to fix alpha mask loading issue

When loading an image with an alpha mask in JavaScript canvas, there is an issue where the alpha and RGB channels are premultiplied. To avoid reliance on JavaScript canvas, I added support for channel-specific image data retrieval in the "/view" API. This allows us to retrieve data for each channel separately and fix the alpha mask loading issue. The changes have been committed to the repository.

* Enable brush preview for key and slider events

* optimize

* preview fix

* robust patch

* fix copy (clipspace) action
imgs[0] copy -> whole imgs copy

* support batch images on clipspace, maskeditor

* copy/paste bug fixes for batch images
enhance selector preview on clipspace menu
add img_paste_mode option into clipspace menu

* crash fix

* print message if clipspace content cannot editable

* Update web/extensions/core/maskeditor.js

Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>

* make default img_paste_mode to 'selected'

refactor space -> tab

* save clipspace files to input/clipspace instead of temp

* show "clipspace/filename.png" instead of 'filename.png [clipspace]' in LoadImage/LoadImageMask

* refresh fix related to FILE_COMBO

* Update web/extensions/core/maskeditor.js

Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>

* Update web/extensions/core/maskeditor.js

Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>

* adjust margin based on missionfloyd impelements

* mouse event -> pointer event

* pen, touch, mouse drawing patched and tested

* Update web/extensions/core/maskeditor.js

Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>

* add comment about touch event.

---------

Co-authored-by: Lt.Dr.Data <lt.dr.data@gmail.com>
Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>
2023-05-08 14:37:36 -04:00
EllangoK 6aae1f497f style context menu
fix graphdialog background, and palette template
2023-05-01 13:16:19 -04:00
pythongosssss ffd0f9f417 Search filter by type 2023-04-29 17:19:14 +01:00
comfyanonymous 989acd769a Cleanup. 2023-04-21 23:43:38 -04:00
comfyanonymous d5a59da662 Merge branch 'slotDefaults-dynamic' of https://github.com/omar92/ComfyUI 2023-04-21 23:39:55 -04:00
missionfloyd 98ae4bbfde
Remove brackets if weight == 1 2023-04-20 23:55:20 -06:00
missionfloyd d2ef3465ca
Improve current word selection 2023-04-20 18:23:51 -06:00
omar92 5229c1f972 add option on the settings to change the number of the suggestions 2023-04-20 21:13:14 +02:00
omar92 94e9798a4b when drag from node input or output show all possible nodes that you can connect 2023-04-20 06:19:56 +02:00
comfyanonymous b016e2769f Saner range of values. 2023-04-18 02:25:57 -04:00
missionfloyd a7c7da68dc
Editattention setting (#533)
* Add editAttention delta setting

* Update editAttention.js

* Update web/extensions/core/editAttention.js

Co-authored-by: Karun <karun.ellango7@gmail.com>

* Update editAttention.js

* Update editAttention.js

* Fix setting value

---------

Co-authored-by: Karun <karun.ellango7@gmail.com>
2023-04-18 02:22:05 -04:00
comfyanonymous b9b1df3038 Merge branch 'edit-attention-fix' of https://github.com/EllangoK/ComfyUI 2023-04-17 23:57:20 -04:00
EllangoK a962222992 correctly checks end of the text 2023-04-17 23:40:44 -04:00
comfyanonymous c8afa7e9fb Merge branch 'settings-slider' of https://github.com/missionfloyd/ComfyUI 2023-04-17 22:45:46 -04:00
EllangoK 79ba0399d8 selects current word automatically 2023-04-17 19:02:08 -04:00
comfyanonymous b8c636b10d Lower how much CTRL+arrow key changes the number. 2023-04-17 18:21:24 -04:00
EllangoK 7b5eb196db allows control arrow to edit attention in textarea 2023-04-17 17:29:22 -04:00
Tomoaki Hayasaka 22bde7957e Fix "Ctrl+Enter doesn't work when textarea has focus" regression introduced in #491. 2023-04-17 01:58:33 +09:00
Karun bc16b70bde
Adds several keybinds that interact with ComfyUI (#491)
* adds keybinds that interact w/ comfy menu

* adds remaining keybinds

* adds keybinds to readme and converts to table

* ctrl s and o save and open workflow

* moves keybinds to sep file, update readme

* remap load default, support keycodes

* update keybinds table, prepends comfy to ids

* escape exits out of modals

* modifier keys also use map

* adds setting for filename prompt

* better handle filename prompt

Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>
2023-04-16 01:25:11 -04:00
jwd-dev 8cd170f40d node serialization 2023-04-15 20:16:28 -04:00
jwd-dev fb61c75e39 default text property incase we need one. 2023-04-15 19:58:46 -04:00
Jake D 9587ea90c8
Create noteNode.js 2023-04-15 19:50:05 -04:00
comfyanonymous a40499891e Merge branch 'fix-combo-auto-primitive' of https://github.com/pythongosssss/ComfyUI 2023-04-15 12:36:43 -04:00
pythongosssss f5a78658b7 Fix double click on converted combo widget link 2023-04-15 17:34:46 +01:00
pythongosssss 887ea0ba83 style 2023-04-15 10:55:19 +01:00
pythongosssss 901a890199 Allow combo primitive to connect to multiple inputs 2023-04-15 10:53:30 +01:00
comfyanonymous 61e7767ca6 Merge branch 'Allow-connect-premitiveNode-to-forceInput-comfyiUI-nodes' of https://github.com/omar92/ComfyUI 2023-04-14 00:59:31 -04:00
missionfloyd 307ef543bf
Change grid size to slider 2023-04-13 10:04:06 -06:00
EllangoK ff0be60ac4 fix comfy list not styled, and light theme border 2023-04-13 06:38:24 -04:00
FizzleDorf 3f52e7cbb1
Seed controls added to Ksamplers (#296)
Co-authored-by: flyingshutter <flyingshutter@users.noreply.github.com>
2023-04-12 20:57:13 -04:00