Commit Graph

141 Commits

Author SHA1 Message Date
comfyanonymous
c7903e72ad Add control_after_generate to combo primitive. 2023-05-16 03:18:11 -04:00
Dr.Lt.Data
a395b80989 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
bca2f7d2f1 Fix masked editor issue with firefox on windows. 2023-05-08 15:52:33 -04:00
comfyanonymous
7e151778a3 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
4c259c71e5 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
84644db53a style context menu
fix graphdialog background, and palette template
2023-05-01 13:16:19 -04:00
pythongosssss
680dc6116d Search filter by type 2023-04-29 17:19:14 +01:00
comfyanonymous
eb7a0faa30 Cleanup. 2023-04-21 23:43:38 -04:00
comfyanonymous
ce8dacc0de Merge branch 'slotDefaults-dynamic' of https://github.com/omar92/ComfyUI 2023-04-21 23:39:55 -04:00
missionfloyd
726927e17b Remove brackets if weight == 1 2023-04-20 23:55:20 -06:00
missionfloyd
a900b94df2 Improve current word selection 2023-04-20 18:23:51 -06:00
omar92
704383c26d add option on the settings to change the number of the suggestions 2023-04-20 21:13:14 +02:00
omar92
c232d693da when drag from node input or output show all possible nodes that you can connect 2023-04-20 06:19:56 +02:00
comfyanonymous
7085f624c7 Saner range of values. 2023-04-18 02:25:57 -04:00
missionfloyd
c15e61ffc9 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
d492b289d4 Merge branch 'edit-attention-fix' of https://github.com/EllangoK/ComfyUI 2023-04-17 23:57:20 -04:00
EllangoK
0d3b0553ae correctly checks end of the text 2023-04-17 23:40:44 -04:00
comfyanonymous
922a327ca9 Merge branch 'settings-slider' of https://github.com/missionfloyd/ComfyUI 2023-04-17 22:45:46 -04:00
EllangoK
9e00f1bfc5 selects current word automatically 2023-04-17 19:02:08 -04:00
comfyanonymous
40ef940c6f Lower how much CTRL+arrow key changes the number. 2023-04-17 18:21:24 -04:00
EllangoK
b26a787f18 allows control arrow to edit attention in textarea 2023-04-17 17:29:22 -04:00
Tomoaki Hayasaka
605fe1aeb1 Fix "Ctrl+Enter doesn't work when textarea has focus" regression introduced in #491. 2023-04-17 01:58:33 +09:00
Karun
80512e598a 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
5ebb0816c8 node serialization 2023-04-15 20:16:28 -04:00
jwd-dev
2442150ddd default text property incase we need one. 2023-04-15 19:58:46 -04:00
Jake D
8c8c44e8b0 Create noteNode.js 2023-04-15 19:50:05 -04:00
comfyanonymous
70bcf52e28 Merge branch 'fix-combo-auto-primitive' of https://github.com/pythongosssss/ComfyUI 2023-04-15 12:36:43 -04:00
pythongosssss
6edcf41977 Fix double click on converted combo widget link 2023-04-15 17:34:46 +01:00
pythongosssss
498622f07e style 2023-04-15 10:55:19 +01:00
pythongosssss
b89b4ed61c Allow combo primitive to connect to multiple inputs 2023-04-15 10:53:30 +01:00
comfyanonymous
ba91d80870 Merge branch 'Allow-connect-premitiveNode-to-forceInput-comfyiUI-nodes' of https://github.com/omar92/ComfyUI 2023-04-14 00:59:31 -04:00
missionfloyd
42f9a7452e Change grid size to slider 2023-04-13 10:04:06 -06:00
EllangoK
f9cd061774 fix comfy list not styled, and light theme border 2023-04-13 06:38:24 -04:00
FizzleDorf
b062f87a7e Seed controls added to Ksamplers (#296)
Co-authored-by: flyingshutter <flyingshutter@users.noreply.github.com>
2023-04-12 20:57:13 -04:00
pythongosssss
dadfac7d07 Changed default name to be the node type not title 2023-04-12 13:52:19 +01:00
comfyanonymous
ee8ca50967 Change colour of background in light theme. 2023-04-11 23:23:06 -04:00
EllangoK
57be70b04a simplify setting color of root, fixes fg and bg 2023-04-11 13:24:32 -04:00
EllangoK
182bc15f03 adds light theme, fixes multiline css 2023-04-11 13:11:39 -04:00
EllangoK
e1f8b7b24d fix node slot colors for solarized
previously many dupes, and same colors as base
2023-04-11 12:09:15 -04:00
EllangoK
c458f7d9b4 colorPalette modifies comfyUI as well 2023-04-11 11:38:55 -04:00
comfyanonymous
b458942ab3 Merge branch 'node-templates' of https://github.com/pythongosssss/ComfyUI 2023-04-08 18:37:05 -04:00
EllangoK
4354be0cb4 assign link_type_colors directly 2023-04-08 13:18:23 -04:00
omar92
b2779e064f handle double click create primitive widget 2023-04-08 19:05:22 +02:00
omar92
f1b146e82e Allow connect premitive Node to "comfyiUI-nodes that have forceInput setting" 2023-04-08 18:58:47 +02:00
EllangoK
d379a0abc5 link colors change after palette swap
didn't work previously as same function was defined repeatedly
2023-04-08 11:55:27 -04:00
EllangoK
23dd6cf99b remove test render link file 2023-04-08 11:13:27 -04:00
EllangoK
3d32435d5a cleanup customizeRenderLink 2023-04-08 10:59:34 -04:00
EllangoK
ee82a4c320 matches entry for correct link color 2023-04-08 10:47:15 -04:00
EllangoK
c91fcdbfb2 link color is set to nodeType color 2023-04-08 10:43:04 -04:00
pythongosssss
2ce3dac5ad Adds menu for adding + managing node templates 2023-04-08 14:39:10 +01:00
EllangoK
8df8d9b7d0 manual set default link color 2023-04-08 09:28:35 -04:00
EllangoK
998f1391eb fixes NODE_TITLE_COLOR not being set 2023-04-07 20:12:24 -04:00
EllangoK
36dfd0c513 colorPalette sets LiteGraph colors 2023-04-07 19:42:03 -04:00
mligaintart
3afd02a351 Adds orientation settings to reroute nodes, allowing for cleaner
graphes.
2023-04-03 17:47:32 -04:00
comfyanonymous
39d93d5924 Merge branch 'master' of https://github.com/omar92/ComfyUI 2023-04-03 16:52:59 -04:00
omar92
25002a6f5b check if workflowNode And widgets_values are defined as they were causing errors on QueuePrompt after loading workFlow 2023-04-03 22:01:18 +02:00
omar92
16165d1cbb fix bug in reroute node , that didnt allow to load old worflows 2023-04-03 21:27:43 +02:00
pythongosssss
23ec655c0d Merge remote-tracking branch 'origin/master' into combo_filter_input 2023-04-03 11:00:12 +01:00
pythongosssss
41d39c8ed4 Fix scaled position when filtering
Add esc to close
2023-04-03 08:11:44 +01:00
pythongosssss
1fdc757b91 Fix scaled position 2023-04-02 21:37:24 +01:00
pythongosssss
2235bed569 Update comment 2023-04-02 21:02:40 +01:00
pythongosssss
b074cb6b88 Added keyboard navigation + selection 2023-04-02 21:01:39 +01:00
comfyanonymous
041c24e4d7 Merge branch 'snap-to-grid' of https://github.com/pythongosssss/ComfyUI 2023-04-02 14:13:55 -04:00
pythongosssss
82cf5eba28 Add support for multiselect 2023-04-02 19:12:00 +01:00
pythongosssss
23dbea1d3e Added filter input to combos 2023-04-02 19:03:34 +01:00
comfyanonymous
4884e4522c Merge branch 'fix-hidden-save-prefix' of https://github.com/tjhayasaka/ComfyUI 2023-04-02 14:00:05 -04:00
pythongosssss
a85b48aa5b Adds middle click for default node creation
Enable two useful properties
2023-04-02 15:57:12 +01:00
Tomoaki Hayasaka
3ee0d555aa Fix "extra filename replacements in SaveImage is not done when prefix is supplied by Primitive". 2023-04-02 23:42:50 +09:00
pythongosssss
b740c40402 Snap to grid 2023-04-02 15:33:34 +01:00
flyingshutter
5845c7487c fix client freeze on connect reroutes in a circle 2023-04-01 17:30:47 +02:00
hnmr293
66c4e0e7e7 allow converting optional widgets to inputs 2023-03-30 21:50:35 +09:00
pythongosssss
bd6cfa687f Extra formatting values on SaveImage 2023-03-29 22:09:11 +01:00
Jairo Correa
9980ddb9d4 Color palette setting 2023-03-27 23:36:53 -03:00
comfyanonymous
cc70410c4e Don't completely break workflow if field name changes. 2023-03-25 01:04:02 -04:00
pythongosssss
5363970cf0 Prevent exactly overlapping nodes
Throttle double click
2023-03-24 20:20:34 +00:00
pythongosssss
686ac63e12 Set title to widget name 2023-03-24 16:51:17 +00:00
pythongosssss
f97c108235 Restore original size after add/remove input 2023-03-24 16:36:11 +00:00
pythongosssss
f58c8f3c36 Sync widget changes 2023-03-24 10:27:19 +00:00
pythongosssss
028e32bd91 Added support for converting widgets to inputs (and back) 2023-03-23 21:37:19 +00:00
pythongosssss
e471b625bb Fixed crash removing nodes
due to output link is still being set but not valid
2023-03-17 17:52:20 +00:00
pythongosssss
9d104fea3e Increase size of node 2023-03-16 21:04:54 +00:00
pythongosssss
7ef1b0065e Made node non collapsable
Fixed color of first input link
2023-03-16 14:08:11 +00:00
pythongosssss
a714461762 Fix node link colors 2023-03-13 22:11:09 +00:00
pythongosssss
f60f39e61d Rewrote reroute node for much better usability 2023-03-13 22:00:37 +00:00
comfyanonymous
38de3dc3b6 Merge branch 'uploadimages' of https://github.com/pythongosssss/ComfyUI 2023-03-09 13:30:19 -05:00
pythongosssss
9ee1eb8dc5 Changed to upload to input dir
Fixed jpg
Added dupe support
Changed to use existing nodes
2023-03-09 17:57:59 +00:00
pythongosssss
1fcec7070e Added UploadImage+Mask nodes 2023-03-08 22:07:44 +00:00
pythongosssss
6dc6d16612 Added invert scrolling setting 2023-03-08 20:04:22 +00:00
pythongosssss
087d931d9e Redraw node on opt change 2023-03-03 18:48:22 +00:00
pythongosssss
f6bab67bd2 Changed to store resolved prompt in workflow info 2023-03-03 18:40:50 +00:00
pythongosssss
dfe25a9eaa Adding built in extensions + example 2023-03-03 18:28:34 +00:00