Comfy-Org/ComfyUI_frontend
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI_frontend.git synced 2026-02-03 06:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #146 from altarfinch/master

Browse Source 
Widgets with custom size function don't overflow anymore
This commit is contained in:
Javi Agenjo
2020-06-18 16:19:13 +02:00
committed by GitHub
parent ab7bc960a0 1763ff1a87
commit d8b3778136
3 changed files with 28871 additions and 22639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40288
build/litegraph.js
View File

File diff suppressed because it is too large Load Diff

11214
build/litegraph.min.js vendored
View File

File diff suppressed because it is too large Load Diff

8
src/litegraph.js
View File

@@ -3171,10 +3171,10 @@
/**
* computes the minimum size of a node according to its inputs and output slots
* @method computeSize
* @param {number} minHeight
* @param {number} the optional target width
* @return {number} the total size
*/
LGraphNode.prototype.computeSize = function(out) {
LGraphNode.prototype.computeSize = function(width, out) {
if (this.constructor.size) {
return this.constructor.size.concat();
}
@@ -3226,7 +3226,7 @@
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;
widgets_height += this.widgets[i].computeSize(Math.max(size[0], width || 0))[1] + 4;
else
widgets_height += LiteGraph.NODE_WIDGET_HEIGHT + 4;
}
@@ -5575,7 +5575,7 @@ LGraphNode.prototype.executeAction = function(action)
if (this.resizing_node && !this.live_mode) {
//convert mouse to node space
var desired_size = [ e.canvasX - this.resizing_node.pos[0], e.canvasY - this.resizing_node.pos[1] ];
var min_size = this.resizing_node.computeSize();
var min_size = this.resizing_node.computeSize(desired_size[0]);
desired_size[0] = Math.max( min_size[0], desired_size[0] );
desired_size[1] = Math.max( min_size[1], desired_size[1] );
this.resizing_node.setSize( desired_size );