Commit Graph

325 Commits

Author SHA1 Message Date
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
comfyanonymous d7ec37f296 Merge branch 'master' of https://github.com/jwd-dev/ComfyUI 2023-04-15 20:34:20 -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
pythongosssss 2dd28d4d20 style 2023-04-15 21:41:21 +01:00
pythongosssss eb4035c8bd Adds jsdoc for better dev experience 2023-04-15 21:40:39 +01: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
comfyanonymous 7f23353d63 Merge branch 'fix-combo-primitive' of https://github.com/pythongosssss/ComfyUI 2023-04-15 11:07:03 -04: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
pythongosssss 5186b3266a Prevent generating bad replacement regex 2023-04-15 10:29:32 +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
comfyanonymous f5f701388b Merge branch 'comfy-list-fix' of https://github.com/EllangoK/ComfyUI 2023-04-13 13:50:44 -04:00
missionfloyd 307ef543bf
Change grid size to slider 2023-04-13 10:04:06 -06:00
comfyanonymous 501f200d86 Fix widgets not getting converted correctly in workflows. 2023-04-13 10:38:41 -04:00
EllangoK ff0be60ac4 fix comfy list not styled, and light theme border 2023-04-13 06:38:24 -04:00
missionfloyd 8810e1b4b9 Fix indentation 2023-04-12 21:15:21 -06:00
missionfloyd e87aa1873f Add slider setting type 2023-04-12 19:36:35 -06: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
comfyanonymous e3566679bd Update litegraph from upstream. 2023-04-12 18:00:13 -04:00
comfyanonymous ad8e0cc0fe Merge branch 'default-replace-name' of https://github.com/pythongosssss/ComfyUI 2023-04-12 09:37:14 -04:00
pythongosssss a3516225f9 Changed default name to be the node type not title 2023-04-12 13:52:19 +01:00
pythongosssss d6a3c0d424 Add support for dropping images from urls 2023-04-12 13:49:32 +01:00
comfyanonymous 6c69853afd Change colour of background in light theme. 2023-04-11 23:23:06 -04:00
EllangoK 19ce3df8c0 simplify setting color of root, fixes fg and bg 2023-04-11 13:24:32 -04:00
EllangoK eae159eb4c adds light theme, fixes multiline css 2023-04-11 13:11:39 -04:00
EllangoK c975fef620 fix node slot colors for solarized
previously many dupes, and same colors as base
2023-04-11 12:09:15 -04:00
EllangoK 73c4ba11fa colorPalette modifies comfyUI as well 2023-04-11 11:38:55 -04:00
EllangoK 40ad2d4a10 use variables in css stylesheet 2023-04-11 01:08:01 -04:00
pythongosssss 0f5352d96c style 2023-04-09 11:30:31 +01:00
pythongosssss 3736dc90e1 Add arrow to menu items with submenu 2023-04-09 11:29:55 +01:00
comfyanonymous bece24d25e Merge branch 'fix/pnginfo-import' of https://github.com/filipemeneses/ComfyUI 2023-04-08 18:48:53 -04:00
comfyanonymous c982c937a7 Merge branch 'catch-configure-errors' of https://github.com/pythongosssss/ComfyUI 2023-04-08 18:37:47 -04:00
comfyanonymous b0edcfdc8e Merge branch 'missing-node-warning' of https://github.com/pythongosssss/ComfyUI 2023-04-08 18:37:27 -04:00
comfyanonymous e07f8eab6a Merge branch 'node-templates' of https://github.com/pythongosssss/ComfyUI 2023-04-08 18:37:05 -04:00
comfyanonymous 15da5404e7 Merge branch 'themes' of https://github.com/EllangoK/ComfyUI 2023-04-08 18:14:05 -04:00
comfyanonymous 60ac983238 Merge branch 'master' of https://github.com/city96/ComfyUI 2023-04-08 15:50:26 -04:00
EllangoK 53fba56ee5 assign link_type_colors directly 2023-04-08 13:18:23 -04:00
omar92 9d095c52f3 handle double click create primitive widget 2023-04-08 19:05:22 +02:00
omar92 2dc7257e29 Allow connect premitive Node to "comfyiUI-nodes that have forceInput setting" 2023-04-08 18:58:47 +02:00
EllangoK d9220a0bd6 link colors change after palette swap
didn't work previously as same function was defined repeatedly
2023-04-08 11:55:27 -04:00
pythongosssss 92e912c065 Fix multiple missing 2023-04-08 16:55:09 +01:00
pythongosssss b78ebfcf9d Improve error UI 2023-04-08 16:37:09 +01:00
pythongosssss 12f9bfe895 Better filename check 2023-04-08 16:31:10 +01:00
pythongosssss 79ff7d67a5 Add error handling around initial load of workflow 2023-04-08 16:23:57 +01:00
EllangoK 327e49da42 remove test render link file 2023-04-08 11:13:27 -04:00
Filipe e76890dcb4 Fix large workflow pnginfo import 2023-04-08 12:00:03 -03:00
EllangoK 0d358b9566 cleanup customizeRenderLink 2023-04-08 10:59:34 -04:00
EllangoK 6b638c965b matches entry for correct link color 2023-04-08 10:47:15 -04:00
EllangoK 620c0f9376 link color is set to nodeType color 2023-04-08 10:43:04 -04:00
pythongosssss aad71add69 const 2023-04-08 14:52:24 +01:00
pythongosssss cceb530395 Adds warning when loading graph with nodes you dont have 2023-04-08 14:50:57 +01:00
pythongosssss fe93261456 Add style update 2023-04-08 14:48:15 +01:00
pythongosssss 1acd2ef5d2 Adds menu for adding + managing node templates 2023-04-08 14:39:10 +01:00
pythongosssss 357c0753f8 Support dataset when creating elements
Allow dialog to show element and override buttons
2023-04-08 14:38:45 +01:00
EllangoK 5bb1358dd6 manual set default link color 2023-04-08 09:28:35 -04:00
comfyanonymous ebd7f9bf80 Change the default prompt to something more impressive. 2023-04-08 01:10:15 -04:00
comfyanonymous 463792f068 Allow dragging again. 2023-04-07 23:07:19 -04:00
EllangoK 7bce83aa03 fixes NODE_TITLE_COLOR not being set 2023-04-07 20:12:24 -04:00
EllangoK 2d7ad41142 colorPalette sets LiteGraph colors 2023-04-07 19:42:03 -04:00
comfyanonymous f4e359cce1 Set title of page to ComfyUI. 2023-04-07 16:26:06 -04:00
comfyanonymous 07e9a6b826 Update litegraph from upstream. 2023-04-07 15:11:00 -04:00
comfyanonymous 60b4c31ab3 Add webp images to upload accept list. 2023-04-06 22:22:59 -04:00
comfyanonymous 0bb5f93b92 Merge branch 'image-node-keybindings' of https://github.com/ALSchwalm/ComfyUI 2023-04-06 03:27:42 -04:00
comfyanonymous fb73d008bf Merge branch 'menu-drag' of https://github.com/missionfloyd/ComfyUI 2023-04-06 03:19:20 -04:00
missionfloyd 1a74611c6e Style modals to match rest of UI 2023-04-05 15:56:41 -06:00
missionfloyd 3536a7c8d1 Put drag icon back 2023-04-05 08:57:44 -06:00
missionfloyd 8af2fe1e87 Remove redundant lines 2023-04-04 22:10:45 -06:00
missionfloyd a595c56872 Remove menu drag handle 2023-04-04 22:03:22 -06:00
missionfloyd 30f274bf48
Make the default true 2023-04-04 21:53:02 -06:00
missionfloyd a126e2c185
Merge branch 'master' into confirm-clear 2023-04-04 21:43:28 -06:00
missionfloyd 1b556ea9f4
Add confirmation for clearing canvas 2023-04-04 21:20:49 -06:00
comfyanonymous 255dac25ba Merge branch 'graphdialog-style' of https://github.com/missionfloyd/ComfyUI 2023-04-04 23:04:25 -04:00
Adam Schwalm bf7dbe4702 Add left/right/escape hotkeys for image nodes 2023-04-04 21:02:40 -05:00
missionfloyd de3d5f46ce
Fix .graphdialog style 2023-04-04 19:32:49 -06:00
City 080c758cda Ask for confirmation before clearing nodes 2023-04-04 18:16:23 +02:00
mligaintart dc24d7e2fd Adds orientation settings to reroute nodes, allowing for cleaner
graphes.
2023-04-03 17:47:32 -04:00
comfyanonymous 1ed6cadf12 Merge branch 'master' of https://github.com/omar92/ComfyUI 2023-04-03 16:52:59 -04:00
omar92 ca2ae98470 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 4e43758236 fix bug in reroute node , that didnt allow to load old worflows 2023-04-03 21:27:43 +02:00
pythongosssss de2894ac2c Merge remote-tracking branch 'origin/master' into combo_filter_input 2023-04-03 11:00:12 +01:00
pythongosssss 028e1f7ad2 Fix scaled position when filtering
Add esc to close
2023-04-03 08:11:44 +01:00
pythongosssss 1a322ca67a Fix scaled position 2023-04-02 21:37:24 +01:00
pythongosssss 32fd39b424 Update comment 2023-04-02 21:02:40 +01:00
pythongosssss 74893be1ce Added keyboard navigation + selection 2023-04-02 21:01:39 +01:00
comfyanonymous 72f9235a49 Merge branch 'snap-to-grid' of https://github.com/pythongosssss/ComfyUI 2023-04-02 14:13:55 -04:00
pythongosssss 04234152c1 Add support for multiselect 2023-04-02 19:12:00 +01:00
pythongosssss 8a0a85e0fa Added filter input to combos 2023-04-02 19:03:34 +01:00
comfyanonymous cc66fbe5da Merge branch 'fix-hidden-save-prefix' of https://github.com/tjhayasaka/ComfyUI 2023-04-02 14:00:05 -04:00
pythongosssss 519890a5cc Adds middle click for default node creation
Enable two useful properties
2023-04-02 15:57:12 +01:00
Tomoaki Hayasaka 1917064b56 Fix "extra filename replacements in SaveImage is not done when prefix is supplied by Primitive". 2023-04-02 23:42:50 +09:00
pythongosssss 26dc8e3056 formatting 2023-04-02 15:36:27 +01:00
pythongosssss d027ff121c Snap to grid 2023-04-02 15:33:34 +01:00
pythongosssss 5aefd6cdf3 Support numeric settings, tooltip, extra attrs 2023-04-02 15:16:08 +01:00
comfyanonymous 27fc64ad46 Merge branch 'menu-save-and-anchor' of https://github.com/pythongosssss/ComfyUI 2023-04-02 01:56:12 -04:00
comfyanonymous 9a8f58638c Merge branch 'fixReroute' of https://github.com/flyingshutter/ComfyUI 2023-04-02 01:55:37 -04:00
pythongosssss 178fc76363 Added a queue for the queue action 2023-04-01 18:46:05 +01:00
flyingshutter 9586de9dc8 fix client freeze on connect reroutes in a circle 2023-04-01 17:30:47 +02:00
comfyanonymous 7e682784d7 Merge branch 'fix-modifying-default-graph' of https://github.com/pythongosssss/ComfyUI 2023-03-31 16:11:14 -04:00
pythongosssss 06c2c19b5a Clone default graph before using 2023-03-31 20:35:26 +01:00
comfyanonymous 91f27f08ec Merge branch 'fix-load-history-outputs' of https://github.com/pythongosssss/ComfyUI 2023-03-31 13:13:56 -04:00
pythongosssss 1716aaa7a6 Swap order to prevent being cleared 2023-03-31 18:04:53 +01:00
City e6e30ee7cb Fallback for node title 2023-03-31 00:54:35 +02:00
City 5bcbc007dd Add human-readable names for nodes 2023-03-30 23:13:58 +02:00
pythongosssss 722801ed2d Formatting 2023-03-30 20:15:48 +01:00
pythongosssss 3a5bcdf8b9 Formatting 2023-03-30 20:15:12 +01:00
pythongosssss c93dc2fb89 Remove bottom anchor 2023-03-30 20:14:01 +01:00
pythongosssss 6481c90371 Merge remote-tracking branch 'origin/master' into menu-save-and-anchor 2023-03-30 19:39:50 +01:00
hnmr293 04b42bad87 allow converting optional widgets to inputs 2023-03-30 21:50:35 +09:00
comfyanonymous 974235a272 Merge branch 'master' of https://github.com/city96/ComfyUI 2023-03-30 00:35:07 -04:00
comfyanonymous 786f7f767a Merge branch 'extra-filename-replacements' of https://github.com/pythongosssss/ComfyUI 2023-03-30 00:14:48 -04:00
City 8a730ed20e Turn comfy-menu into a sidebar on small screens 2023-03-30 01:43:31 +02:00
pythongosssss 80e014a69e Extra formatting values on SaveImage 2023-03-29 22:09:11 +01:00
pythongosssss 7db120b9a9 Merge remote-tracking branch 'origin/master' into menu-save-and-anchor 2023-03-29 19:39:25 +01:00
pythongosssss 00c1ec498f Fix crash if node is removed mid run 2023-03-29 19:03:38 +01:00
pythongosssss 6f72c4c6ff Allows nodes to return ui data and output data
Fire executed event on node when message received
2023-03-29 18:53:24 +01:00
comfyanonymous 2b60c308be Merge branch 'mute-nodes' of https://github.com/jn-jairo/ComfyUI 2023-03-29 10:58:52 -04:00
City 0f92d41ac7 Match comfy-menu style to litegraph 2023-03-29 15:52:38 +02:00
pythongosssss 8363ef967d Merge remote-tracking branch 'origin/master' into menu-save-and-anchor 2023-03-29 14:40:45 +01:00
Jairo Correa d5bf2314b3 Mute nodes and shortcuts in README 2023-03-29 05:04:06 -03:00
Farid Safi 40a377775e move clean to handleFile and loadGraphData functions 2023-03-28 20:22:49 +02:00
Farid Safi 393084877c clean state when loading another workflow 2023-03-28 19:45:17 +02:00
pythongosssss 9fdd5245fd Merge remote-tracking branch 'origin/master' into menu-save-and-anchor 2023-03-28 09:53:55 +01:00
Jairo Correa 4b9e11053c Color palette setting 2023-03-27 23:36:53 -03:00
pythongosssss 2d046f85e8 Merge remote-tracking branch 'origin/master' into menu-save-and-anchor 2023-03-27 20:20:08 +01:00
ltdrdata d3a375c8fb
Add support for file list refresh feature in node (#192)
* Added file reload feature to widgets.

* Modify feature name 'reload' to 'refresh' and fixed ignoring button name.

* refresh widget bugfix

* crash patch for "widget" input by type mismatch

* compensate offset on showimage
* adding widget caused misaligned offset

* patch refresh feature for general method

* clean up patch and following upstream

* make more clean code for refresh feature

* move refresh button position

* robust patch for refresh feature

* patch for refreh feature
* avoid specify REFRESH_LIST for each node
* prevent updating selected value unless removed item
* update all combo list for 'required input' in node

---------

Co-authored-by: Lt.Dr.Data <lt.dr.data@gmail.com>
2023-03-27 13:27:09 -04:00
Silversith bb1503ed63
Bugfix/include optional node inputs (#271)
* Minor changes and extra nodes

* Added Preview Image for Nodes

* Add a delete images button on main floating menu

* Add a confirmation dialog

* Remove DeleteAll, Remove Custom KSampler, Remove Image List

* Remove Image and Custom Json Load

* Remove Custom Nodes

* remove patch.diff
2023-03-27 01:16:22 -04:00
comfyanonymous 479ef4b38f Merge branch 'group-header' of https://github.com/jn-jairo/ComfyUI 2023-03-27 00:46:30 -04:00
Jairo Correa 63525ee83c Move group by header 2023-03-26 22:53:49 -03:00
Jairo Correa 967bfce0f3 Optional RETURN_NAMES to set the output name 2023-03-26 21:40:36 -03:00
pythongosssss 0b1e85fbea Add manual flag when restoring pos 2023-03-26 15:10:38 +01:00
pythongosssss 716d8e746a Remove log 2023-03-26 15:03:57 +01:00
pythongosssss 20ae48515e Add setting to save menu position
Add anchoring to side when resizing
Fix losing menu when resizing
2023-03-26 15:01:34 +01:00
pythongosssss a49b5659bc
Merge branch 'comfyanonymous:master' into custom-node-socket 2023-03-26 10:12:39 +01:00
comfyanonymous d68350eee5 Merge branch 'draggable-menu' of https://github.com/jn-jairo/ComfyUI 2023-03-26 00:22:04 -04:00
mezzo-anon 980379bab2 change colors to a more consistent and pleasing palette 2023-03-26 04:11:53 +02:00
Jairo Correa 48d4edbceb Prevent draggable menu to get outside of window 2023-03-25 23:06:00 -03:00
Jairo Correa a5c78a5796 Draggable menu 2023-03-25 20:23:46 -03:00
comfyanonymous 8d66827b15 Merge branch 'slot-color' of https://github.com/jn-jairo/ComfyUI 2023-03-25 12:37:55 -04:00
comfyanonymous 58695f9c7a Fix seed being impossible to increment/decrement by 1. 2023-03-25 11:12:03 -04:00
Jairo Correa 070b5749b3 Slot colors by type 2023-03-25 06:28:09 -03:00
comfyanonymous 44b6eaad6f Don't completely break workflow if field name changes. 2023-03-25 01:04:02 -04:00
comfyanonymous edb3dea88b Merge branch 'widget-inputs' of https://github.com/pythongosssss/ComfyUI 2023-03-24 22:45:40 -04:00
comfyanonymous 5c03b2f31e Merge branch 'mobile-support' of https://github.com/Zentropivity/ComfyUI 2023-03-24 18:23:37 -04:00
pythongosssss d6830b958c Prevent exactly overlapping nodes
Throttle double click
2023-03-24 20:20:34 +00:00
Zentropivity 4461ddc9e6 Change close on mouseleave to false 2023-03-24 19:18:58 +01:00
pythongosssss 1fa9ccaa16 Set title to widget name 2023-03-24 16:51:17 +00:00