Comfy-Org/ComfyUI_frontend
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI_frontend.git synced 2026-02-05 15:40:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #134 from altarfinch/master

Browse Source 
Support custom height for custom widget
This commit is contained in:
Javi Agenjo
2020-05-15 12:14:58 +02:00
committed by GitHub
parent 9fcc6c4975 058e6ea03c
commit 4ec609ab48
6 changed files with 31489 additions and 22275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39685
build/litegraph.js
View File

File diff suppressed because it is too large Load Diff

14000
build/litegraph.min.js vendored
View File

File diff suppressed because it is too large Load Diff

7
src/litegraph.d.ts vendored
View File

@@ -68,11 +68,12 @@ export interface IWidget<TValue = any, TOptions = any> {
* https://github.com/jagenjo/litegraph.js/issues/76
*/
mouse?(
ctx: undefined,
event: MouseEvent,
pos: Vector2,
node: LGraphNode
): void;
): boolean;
/** Called by `LGraphNode.computeSize` */
computeSize?(width: number): [number, number];
}
export interface IButtonWidget extends IWidget<null, {}> {
type: "button";
@@ -1145,7 +1146,7 @@ export declare class LGraphCanvas {
/** Called by `LGraphCanvas.processNodeDblClicked` */
onNodeDblClicked: ((node: LGraphNode) => void) | null;
/** Called by `LGraphCanvas.selectNodes` */
onSelectionChange: ((nodes) => void) | null;
onSelectionChange: ((nodes: Record<number, LGraphNode>) => void) | null;
/** Called by `LGraphCanvas.showSearchBox` */
onSearchBox:
| ((

70
src/litegraph.js
View File

@@ -3173,20 +3173,6 @@
var size = out || new Float32Array([0, 0]);
rows = Math.max(rows, 1);
var font_size = LiteGraph.NODE_TEXT_SIZE; //although it should be graphcanvas.inner_text_font size
size[1] = (this.constructor.slot_start_y || 0) + rows * LiteGraph.NODE_SLOT_HEIGHT;
var widgets_height = 0;
if (this.widgets && this.widgets.length) {
widgets_height = this.widgets.length * (LiteGraph.NODE_WIDGET_HEIGHT + 4) + 8;
}
//compute height using widgets height
if( this.widgets_up )
size[1] = Math.max( size[1], widgets_height );
else if( this.widgets_start_y != null )
size[1] = Math.max( size[1], widgets_height + this.widgets_start_y );
else
size[1] += widgets_height;
var font_size = font_size;
var title_width = compute_text_size(this.title);
@@ -3221,6 +3207,27 @@
size[0] = Math.max(size[0], LiteGraph.NODE_WIDTH * 1.5);
}
size[1] = (this.constructor.slot_start_y || 0) + rows * LiteGraph.NODE_SLOT_HEIGHT;
var widgets_height = 0;
if (this.widgets && this.widgets.length) {
for (var i = 0, l = this.widgets.length; i < l; ++i) {
if (this.widgets[i].computeSize)
widgets_height += this.widgets[i].computeSize(size[0])[1] + 4;
else
widgets_height += LiteGraph.NODE_WIDGET_HEIGHT + 4;
}
widgets_height += 8;
}
//compute height using widgets height
if( this.widgets_up )
size[1] = Math.max( size[1], widgets_height );
else if( this.widgets_start_y != null )
size[1] = Math.max( size[1], widgets_height + this.widgets_start_y );
else
size[1] += widgets_height;
if (this.onResize) {
this.onResize(size);
}
@@ -5566,19 +5573,27 @@ LGraphNode.prototype.executeAction = function(action)
this.resizing_node.inputs ? this.resizing_node.inputs.length : 0,
this.resizing_node.outputs ? this.resizing_node.outputs.length : 0
);
var min_height =
max_slots * LiteGraph.NODE_SLOT_HEIGHT +
(this.resizing_node.widgets ? this.resizing_node.widgets.length : 0) * (LiteGraph.NODE_WIDGET_HEIGHT + 4) + 4;
if (this.resizing_node.size[1] < min_height) {
this.resizing_node.size[1] = min_height;
}
if (this.resizing_node.size[0] < LiteGraph.NODE_MIN_WIDTH) {
this.resizing_node.size[0] = LiteGraph.NODE_MIN_WIDTH;
}
if (this.resizing_node.onResize) {
this.resizing_node.onResize(this.resizing_node.size);
}
var widgets = this.resizing_node.widgets;
var widgets_height = 0;
if (widgets && widgets.length) {
for (var i = 0, l = widgets.length; i < l; ++i) {
if (widgets[i].computeSize)
widgets_height += widgets[i].computeSize(this.resizing_node.size[0])[1] + 4;
else
widgets_height += LiteGraph.NODE_WIDGET_HEIGHT + 4;
}
widgets_height += 8;
}
var min_height = max_slots * LiteGraph.NODE_SLOT_HEIGHT + widgets_height;
if (this.resizing_node.size[1] < min_height) {
this.resizing_node.size[1] = min_height;
}
this.canvas.style.cursor = "se-resize";
this.dirty_canvas = true;
@@ -8412,11 +8427,11 @@ LGraphNode.prototype.executeAction = function(action)
break;
default:
if (w.draw) {
w.draw(ctx, node, w, y, H);
w.draw(ctx, node, width, y, H);
}
break;
}
posY += H + 4;
posY += (w.computeSize ? w.computeSize(width)[1] : H) + 4;
ctx.globalAlpha = this.editor_alpha;
}
@@ -8448,7 +8463,8 @@ LGraphNode.prototype.executeAction = function(action)
var w = node.widgets[i];
if(!w || w.disabled)
continue;
if ( w == active_widget || (x > 6 && x < width - 12 && y > w.last_y && y < w.last_y + LiteGraph.NODE_WIDGET_HEIGHT) ) {
var widget_height = w.computeSize ? w.computeSize(width)[1] : LiteGraph.NODE_WIDGET_HEIGHT;
if ( w == active_widget || (x > 6 && x < width - 12 && y > w.last_y && y < w.last_y + widget_height) ) {
//inside widget
switch (w.type) {
case "button":
@@ -8582,7 +8598,7 @@ LGraphNode.prototype.executeAction = function(action)
break;
default:
if (w.mouse) {
w.mouse(ctx, event, [x, y], node);
this.dirty_canvas = w.mouse(event, [x, y], node);
}
break;
} //end switch

1
src/nodes/glfx.js
View File

@@ -1,5 +1,6 @@
(function(global) {
var LiteGraph = global.LiteGraph;
var LGraphTexture = global.LGraphTexture;
//Works with Litegl.js to create WebGL nodes
if (typeof GL != "undefined") {

1
src/nodes/gltextures.js
View File

@@ -1,5 +1,6 @@
(function(global) {
var LiteGraph = global.LiteGraph;
var LGraphCanvas = global.LGraphCanvas;
//Works with Litegl.js to create WebGL nodes
global.LGraphTexture = null;