wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-01-27 06:40:16 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'comfyanonymous:master' into quantize-palette

Browse Source
This commit is contained in:
missionfloyd 2023-04-08 02:01:30 -06:00 committed by GitHub
commit 809a1dd23d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/lib/litegraph.core.js
View File

@ -7481,8 +7481,8 @@ LGraphNode.prototype.executeAction = function(action)
clientY_rel = e.clientY; clientY_rel = e.clientY;
} }
// e.deltaX = clientX_rel - this.last_mouse_position[0]; e.deltaX = clientX_rel - this.last_mouse_position[0];
// e.deltaY = clientY_rel- this.last_mouse_position[1]; e.deltaY = clientY_rel- this.last_mouse_position[1];
this.last_mouse_position[0] = clientX_rel; this.last_mouse_position[0] = clientX_rel;
this.last_mouse_position[1] = clientY_rel; this.last_mouse_position[1] = clientY_rel;
@ -9923,7 +9923,14 @@ LGraphNode.prototype.executeAction = function(action)
case "number": case "number":
case "combo": case "combo":
var old_value = w.value; var old_value = w.value;
if (event.type == LiteGraph.pointerevents_method+"move" && w.type == "number") { var delta = x < 40 ? -1 : x > widget_width - 40 ? 1 : 0;
var allow_scroll = true;
if (delta) {
if (x > -3 && x < widget_width + 3) {
allow_scroll = false;
}
}
if (allow_scroll && event.type == LiteGraph.pointerevents_method+"move" && w.type == "number") {
if(event.deltaX) if(event.deltaX)
w.value += event.deltaX * 0.1 * (w.options.step || 1); w.value += event.deltaX * 0.1 * (w.options.step || 1);
if ( w.options.min != null && w.value < w.options.min ) { if ( w.options.min != null && w.value < w.options.min ) {

6
web/scripts/defaultGraph.js
View File

@ -13,7 +13,7 @@ export const defaultGraph = {
inputs: [{ name: "clip", type: "CLIP", link: 5 }], inputs: [{ name: "clip", type: "CLIP", link: 5 }],
outputs: [{ name: "CONDITIONING", type: "CONDITIONING", links: [6], slot_index: 0 }], outputs: [{ name: "CONDITIONING", type: "CONDITIONING", links: [6], slot_index: 0 }],
properties: {}, properties: {},
widgets_values: ["bad hands"], widgets_values: ["text, watermark"],
}, },
{ {
id: 6, id: 6,
@ -26,7 +26,7 @@ export const defaultGraph = {
inputs: [{ name: "clip", type: "CLIP", link: 3 }], inputs: [{ name: "clip", type: "CLIP", link: 3 }],
outputs: [{ name: "CONDITIONING", type: "CONDITIONING", links: [4], slot_index: 0 }], outputs: [{ name: "CONDITIONING", type: "CONDITIONING", links: [4], slot_index: 0 }],
properties: {}, properties: {},
widgets_values: ["masterpiece best quality girl"], widgets_values: ["beautiful scenery nature glass bottle landscape, , purple galaxy bottle,"],
}, },
{ {
id: 5, id: 5,
@ -56,7 +56,7 @@ export const defaultGraph = {
], ],
outputs: [{ name: "LATENT", type: "LATENT", links: [7], slot_index: 0 }], outputs: [{ name: "LATENT", type: "LATENT", links: [7], slot_index: 0 }],
properties: {}, properties: {},
widgets_values: [8566257, true, 20, 8, "euler", "normal", 1], widgets_values: [156680208700286, true, 20, 8, "euler", "normal", 1],
}, },
{ {
id: 8, id: 8,