586 Commits

Author SHA1 Message Date
pythongosssss
13dda04559 Fix merge adding restore view to loadGraphData 2024-06-24 18:04:44 +01:00
pythongosssss
46c8fd5178 Fix breaking old menu position 2024-06-22 17:21:02 +01:00
pythongosssss
120c99eccc Fix merge 2024-06-19 20:26:12 +01:00
pythongosssss
f599e5ca30 Merge remote-tracking branch 'origin/master' into newmenu 2024-06-19 20:23:56 +01:00
pythongosssss
4643e37599 Various fixes 2024-06-19 20:18:08 +01:00
Juanjuan
379ff92e9e
fix app.js no graph defined (#3754)
* local test

* fix "graph" not found

* fix

---------

Co-authored-by: Xiujuan Li <xiujuali@amazon.com>
2024-06-17 07:56:53 -04:00
comfyanonymous
cb8d0ebccc Don't load the view coordinates when loading a workflow from the history.
I think this makes things slightly less annoying for some users.
2024-06-03 19:48:27 -04:00
luke zhang
34030fed92
improve dom widget performance (#3584) 2024-05-27 14:26:07 -04:00
Regis Gaughan, III
f6a203951f
Extend core snapToGrid to LiteGraph Groups. (#3393)
Extends the core Comfy.SnapToGrid behavior for nodes to apply to LiteGraph's LGraphGroup with the same behavior. Also, pulls out redundant rounding code into util function.
2024-05-27 14:05:51 -04:00
DLohn
5b87369474
Load titles from API format JSON (#3563) 2024-05-24 23:53:15 -04:00
comfyanonymous
6507a9c716 Remove the CTRL-Delete keybind.
On some keyboards it's apparently too easy to accidentally do CTRL-Delete
when pressing CTRL-Enter repeatedly.

CTRL-Backspace can still be used to clear the workflow.
2024-05-23 01:29:22 -04:00
comfyanonymous
1c4af5918a Better error message if the webcam node doesn't work. 2024-05-17 14:02:09 -04:00
pythongosssss
91590adf04
Add webcam node (#3497)
* Add webcam node

* unused import
2024-05-17 13:16:08 -04:00
pythongosssss
9f5eb4b59d Bottom menu wip 2024-05-16 13:17:29 +01:00
freakabcd
cf6e1efb69
Show message on error when loading wf from file (works on drag and drop) (#3466) 2024-05-13 15:22:22 -04:00
pythongosssss
16ba362746 Add reset view button
Prevent view changes causing history entries
2024-05-13 17:17:20 +01:00
pythongosssss
5f90d132e7 Merge remote-tracking branch 'origin/master' into newmenu 2024-05-13 17:03:42 +01:00
comfyanonymous
4f63ee99f1 Add a button to reset the view. 2024-05-10 17:30:52 -04:00
pythongosssss
f374ea714d
Setting for saving and restoring canvas position and zoom level (#3437) 2024-05-10 17:07:46 -04:00
pythongosssss
80f1cc486d Merge remote-tracking branch 'origin/master' into newmenu 2024-05-10 21:17:40 +01:00
pythongosssss
305cda125c Fix overflow issue on iOS 2024-05-10 21:14:55 +01:00
Dr.Lt.Data
d7fa417bfa
feat: shortcuts for zoom in/out (#3410)
* feat: shortcuts for zoom in/out

* feat: pen support for canvas zoom

ctrl + LMB + vertical drag

* Ctrl+LMB+Drag -> ctrl+Shift+LMB+Drag

---------

Co-authored-by: Lt.Dr.Data <lt.dr.data@gmail.com>
2024-05-07 04:40:56 -04:00
vilanele
9a70b70de4
add opacity slider in maskeditor (#3404)
Co-authored-by: vilanele <nomail@email.com>
2024-05-05 05:01:06 -04:00
pythongosssss
5df9838aa7 Increase delay when typing, remove margin on Safari, fix dialog location 2024-05-04 13:49:57 +01:00
pythongosssss
35ff8d4877 Merge remote-tracking branch 'origin/master' into newmenu 2024-05-04 13:31:58 +01:00
comfyanonymous
daa92a8ff4 Fix potential issues with the int rounding fix. 2024-05-03 05:49:21 -04:00
comfyanonymous
89d0e9abeb Fix int widgets rounding. 2024-05-02 03:34:19 -04:00
Torbjörn Lönnemark
a88b0ebc2d
Improve node input/widget conversion sub-menus (#3281)
* Make input/widget conversion sub-menus optional

* Improve input/widget conversion sub-menu text

- Fix incorrect text for conversion from widget to input, previously it
  effectively said "convert input to input"
- Use "input" instead of "🔘".  The former is clearer and consistent
  with the rest of the application.
- Use title case (consistent with the rest of the menu entries).
- Strip the trailing periods. There is already a visual indicator for
  sub-menus, and no other sub-menus use trailing periods.
2024-04-18 16:41:23 -04:00
comfyanonymous
d64e217427 Fix annoying float issue causing the value to be rounded to above the max. 2024-04-17 17:34:02 -04:00
Dr.Lt.Data
072e3bd2b5
Fixed an issue where the main menu disappears intermittently as the coordinates become negative. (#3269) 2024-04-17 16:36:49 -04:00
comfyanonymous
744ac944db Don't make dynamicPrompts the default on multiline string inputs.
This should be less confusing to those who want to use multiline input
without them.
2024-04-13 16:18:00 -04:00
NyaamZ
2bef134ebf
change Convert.. input (#3246) 2024-04-12 17:02:17 -04:00
comfyanonymous
4bd7d55b90 Add some colors to SamplerCustom links.
If you don't like them I am open to a PR.
2024-04-11 22:43:05 -04:00
pythongosssss
8a8f4a59e0 Merge remote-tracking branch 'origin/master' into newmenu 2024-04-07 15:41:54 +01:00
Gorka Eguileor
de172f8be7
Improve A1111 metadata parsing (#3216)
* A1111 import: Set VAE name

This patch sets the VAE name for the `VAELoader` when present in the png
metadata.

* A1111 import: Skip all hashes

When importing from A1111 the parsing assumes that values of a key will
never contain a ":", which is not correct.

There are 2 cases where we can have ":" in the value:

- Inside a string. E.g.:
  Lora hashes: "xl_more_art-full_v1: fe3b4816be83, add-detail-xl: 9c783c8ce46c"

- When the value is a json dictionary. E.g.:
  Hashes: {"vae": "63aeecb90f", "embed:negativeXL_D": "fff5d51ab6"}

This patch changes how we parse the metadata to take those 2 cases into
account and also skips the following additional keys that are present in
some Forge images:

- Version
- VAE hash
- TI hashes
- Lora hashes
- Hashes

* A1111 import: Parse Hires steps

This patch parses the `Hires steps` parameter that is part of the High
Resolution Upscale configuration when it  is present, and fallbacks to
the one from the `samplerNode` (like the code currently does) if it's
not present.
2024-04-06 12:10:17 -04:00
comfyanonymous
a7dd82e668 Fix copy paste issue with litegraph. 2024-04-05 14:59:05 -04:00
pythongosssss
45f59d28c1 Fix menu disappearing on chrome 2024-04-03 21:10:16 +01:00
pythongosssss
0406679f18 Toggle body display on setting change 2024-03-23 21:20:46 +00:00
pythongosssss
ea611cf8c9 Dont reorder open workflows
Allow elements around canvas
2024-03-23 21:13:19 +00:00
pythongosssss
c3c76dffe8 dialog fix 2024-03-21 21:25:51 +00:00
pythongosssss
8ebe857105 remove debugging code 2024-03-21 21:05:42 +00:00
pythongosssss
f23d37a2d3 show hover items on smaller screen (mobile) 2024-03-21 20:29:34 +00:00
pythongosssss
69d5f97488 Fix colors on all themes 2024-03-21 18:08:46 +00:00
pythongosssss
a0d505a34a Fix test, revert accidental changes to groupNode 2024-03-21 17:50:14 +00:00
pythongosssss
9be066014e Fix export name 2024-03-20 19:28:43 +00:00
pythongosssss
ef430e58ae remove glow 2024-03-20 19:24:54 +00:00
pythongosssss
ba00f00760 hide element until it is drawn 2024-03-20 19:24:43 +00:00
pythongosssss
160d93b9f6 resize on setting change 2024-03-20 19:24:27 +00:00
pythongosssss
c41efe65e1 use filename as workflow name 2024-03-20 19:14:27 +00:00
pythongosssss
0052c6663c fix top offset 2024-03-20 19:14:15 +00:00