Commit Graph

285 Commits

Author SHA1 Message Date
Lt.Dr.Data
716640b3eb preview fix 2023-04-27 15:33:54 +09:00
Lt.Dr.Data
eb3b6c0581 optimize 2023-04-27 15:29:07 +09:00
Lt.Dr.Data
1f9e88fcd1 Enable brush preview for key and slider events 2023-04-27 14:59:02 +09:00
Lt.Dr.Data
45b049669b 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.
2023-04-27 14:33:02 +09:00
ltdrdata
a13fee6882
Update web/extensions/core/maskeditor.js
Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>
2023-04-27 14:05:36 +09:00
Lt.Dr.Data
d423798cea keyup -> keydown event 2023-04-27 11:54:52 +09:00
Lt.Dr.Data
c66b114879 missionfloyd implementation
* hiding brush preview off the canvas
* change brush size on wheel event
2023-04-27 11:47:44 +09:00
Lt.Dr.Data
d662e9298e refactor: Replace brush preview feature with missionfloyd implementation 2023-04-27 10:25:04 +09:00
Lt.Dr.Data
fc976f48b1 Add cursor functionality to display brush size 2023-04-27 10:15:50 +09:00
ltdrdata
ce55aa784a
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-26 20:37:45 +09:00
ltdrdata
5cc97cf2bf 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
2023-04-26 20:36:58 +09:00
Jake D
54251ad85e
Colored MultilineWidget (#524)
* fixes colors and z-index

* light mode fix

* Update widgets.js
2023-04-26 01:22:36 -04:00
ltdrdata
d40e08cb5f
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-26 09:17:42 +09:00
comfyanonymous
ee3a12d283 Update litegraph from upstream. 2023-04-25 19:18:50 -04:00
Lt.Dr.Data
9926897b78 clean code 2023-04-25 18:02:23 +09:00
ltdrdata
7dc1dd6503
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-25 16:21:17 +09:00
Lt.Dr.Data
79a07bb813 clean commit 2023-04-25 12:01:32 +09:00
Lt.Dr.Data
55e46e708e Merge branch 'Main' into feature/maskpainting 2023-04-25 11:52:53 +09:00
comfyanonymous
36acce58e7 Auto increase the size of the image upload widget when there's an image. 2023-04-24 18:13:18 -04:00
Dr.Lt.Data
76db999497 Fix button positioning issue related to window height.
Change brush size from button to slider.
2023-04-24 21:30:06 +09:00
comfyanonymous
ccad603b2e Add a way for nodes to validate their own inputs. 2023-04-23 16:03:26 -04:00
ltdrdata
f7a8218814
Add clipspace feature. (#541)
* 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.

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

* robust patch & refactoring folder_paths about annotated_filepath

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

* instant refresh on paste

force triggering 'changed' on paste action

* subfolder fix on paste logic

attach subfolder if subfolder isn't empty

---------

Co-authored-by: Lt.Dr.Data <lt.dr.data@gmail.com>
2023-04-23 15:58:55 -04:00
ltdrdata
ea19315b4d event listener patch
add ], [ key event for brush size
remove listener on close
2023-04-24 00:01:20 +09:00
ltdrdata
cc7ad627a8 Merge branch 'feature/clipspace' into feature/maskpainting 2023-04-23 23:34:39 +09:00
ltdrdata
b2abfa6ad7 subfolder fix on paste logic
attach subfolder if subfolder isn't empty
2023-04-23 23:32:48 +09:00
ltdrdata
a09406bff5 robust patch
again...
2023-04-23 23:05:00 +09:00
ltdrdata
1a9c556890 robust patch
use mouseup event
2023-04-23 22:59:20 +09:00
ltdrdata
b5a7bd2be1 enhance mask painting
smooth drawing
add brush_size +/- button
2023-04-23 22:32:32 +09:00
ltdrdata
f8e6adac06 Merge branch 'feature/clipspace' into feature/maskpainting 2023-04-23 21:23:25 +09:00
ltdrdata
8af0b2b52e instant refresh on paste
force triggering 'changed' on paste action
2023-04-23 21:04:06 +09:00
ltdrdata
fb658e7cf3
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-23 18:56:32 +09:00
ltdrdata
80ec9a5ecf
Merge branch 'comfyanonymous:master' into feature/clipspace 2023-04-23 18:55:43 +09:00
pythongosssss
c8355ed39f use window.name instead of session storage
- prevents duplicate stealing session id
2023-04-23 10:31:21 +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
Dr.Lt.Data
588456583d clipspace feature added
maskeditor feature added
2023-04-22 12:31:48 +09:00
Lt.Dr.Data
f5af731ffd Merge branch 'feature/clipspace' into feature/maskpainting 2023-04-21 15:46:57 +09:00
Lt.Dr.Data
5920edba3a Only show the Paste menu if the ComfyApp.clipspace is not empty 2023-04-21 15:45:22 +09:00
Lt.Dr.Data
e09f42bb18 wip 2023-04-21 15:18:06 +09:00
Lt.Dr.Data
10f17f97a6 Merge branch 'feature/clipspace' into feature/maskpainting 2023-04-21 15:17:46 +09:00
ltdrdata
a364df24cc
Merge branch 'comfyanonymous:master' into feature/clipspace 2023-04-21 15:17:28 +09:00
Lt.Dr.Data
4d93ef8a0a robust patch & refactoring folder_paths about annotated_filepath 2023-04-21 15:13:18 +09:00
missionfloyd
98ae4bbfde
Remove brackets if weight == 1 2023-04-20 23:55:20 -06:00
Lt.Dr.Data
d0952e84fe Merge branch 'feature/clipspace' into feature/maskpainting 2023-04-21 13:41:46 +09:00
Lt.Dr.Data
2c21210c72 add original_imgs into clipspace
* Preserve the original image when 'imgs' are modified
2023-04-21 13:40:07 +09: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
Dr.Lt.Data
2e9976fbd9 mask painting on clipspace 2023-04-20 23:24:47 +09:00
Dr.Lt.Data
254aa024f6 Do deep copy for imgs on copy to clipspace. 2023-04-20 23:21:29 +09:00
Dr.Lt.Data
65a005e9a2 rename contentClipboard -> clipspace 2023-04-20 22:36:13 +09:00