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

little fixes

Browse Source
This commit is contained in:
tamat
2018-10-27 15:22:56 +02:00
parent 122450747d
commit 97dd9a95da
2 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/litegraph.js
View File

@@ -1195,7 +1195,7 @@ LGraph.prototype.getGroupOnPos = function(x,y)
for (var i = this._groups.length - 1; i >= 0; i--)
{
var g = this._groups[i];
if(g.isPointInside( x, y, 2 ))
if(g.isPointInside( x, y, 2, true ))
return g;
}
return null;
@@ -2570,11 +2570,13 @@ LGraphNode.prototype.getBounding = function( out )
* @param {number} y
* @return {boolean}
*/
LGraphNode.prototype.isPointInside = function(x,y, margin)
LGraphNode.prototype.isPointInside = function(x,y, margin, skip_title )
{
margin = margin || 0;
var margin_top = this.graph && this.graph.isLive() ? 0 : 20;
if(skip_title)
margin_top = 0;
if(this.flags && this.flags.collapsed)
{
//if ( distance([x,y], [this.pos[0] + this.size[0]*0.5, this.pos[1] + this.size[1]*0.5]) < LiteGraph.NODE_COLLAPSED_RADIUS)
@@ -3859,7 +3861,7 @@ LGraphCanvas.prototype.processMouseDown = function(e)
}
//if do not capture mouse
if( node.onMouseDown && node.onMouseDown( e, [e.canvasX - node.pos[0], e.canvasY - node.pos[1]] ) )
if( node.onMouseDown && node.onMouseDown( e, [e.canvasX - node.pos[0], e.canvasY - node.pos[1]], this ) )
block_drag_node = true;
else if(this.live_mode)
{
@@ -4031,7 +4033,7 @@ LGraphCanvas.prototype.processMouseMove = function(e)
//in case the node wants to do something
if(node.onMouseMove)
node.onMouseMove(e);
node.onMouseMove(e, [e.canvasX - node.pos[0], e.canvasY - node.pos[1]], this);
//if dragging a link
if(this.connecting_node)
@@ -4252,7 +4254,7 @@ LGraphCanvas.prototype.processMouseUp = function(e)
this.dragging_canvas = false;
if( this.node_over && this.node_over.onMouseUp )
this.node_over.onMouseUp(e, [e.canvasX - this.node_over.pos[0], e.canvasY - this.node_over.pos[1]] );
this.node_over.onMouseUp(e, [e.canvasX - this.node_over.pos[0], e.canvasY - this.node_over.pos[1]], this );
if( this.node_capturing_input && this.node_capturing_input.onMouseUp )
this.node_capturing_input.onMouseUp(e, [e.canvasX - this.node_capturing_input.pos[0], e.canvasY - this.node_capturing_input.pos[1]] );
}
@@ -5114,10 +5116,18 @@ LGraphCanvas.prototype.drawBackCanvas = function()
if(this._graph_stack && this._graph_stack.length)
{
ctx.strokeStyle = this._graph_stack[ this._graph_stack.length - 1].bgcolor;
ctx.save();
var parent_graph = this._graph_stack[ this._graph_stack.length - 1];
var subgraph_node = this.graph._subgraph_node;
ctx.strokeStyle = subgraph_node.bgcolor;
ctx.lineWidth = 10;
ctx.strokeRect(1,1,canvas.width-2,canvas.height-2);
ctx.lineWidth = 1;
ctx.font = "40px Arial"
ctx.textAlign = "center";
ctx.fillStyle = subgraph_node.bgcolor;
ctx.fillText( subgraph_node.getTitle(), canvas.width * 0.5, 40 );
ctx.restore();
}
var bg_already_painted = false;
@@ -5519,6 +5529,7 @@ LGraphCanvas.prototype.drawNodeShape = function( node, ctx, size, fgcolor, bgcol
var areaw = size[0]+1;
var areah = render_title ? size[1] + title_height : size[1];
//full node shape
if(!node.flags.collapsed)
{
if(shape == LiteGraph.BOX_SHAPE || this.scale < 0.5)
@@ -5651,6 +5662,9 @@ LGraphCanvas.prototype.drawNodeShape = function( node, ctx, size, fgcolor, bgcol
}
}
}
if(node.onDrawTitle)
node.onDrawTitle(ctx);
}
//render selection marker
@@ -7123,7 +7137,7 @@ LGraphCanvas.prototype.getCanvasMenuOptions = function()
];
if(this._graph_stack && this._graph_stack.length > 0)
options = [{content:"Close subgraph", callback: this.closeSubgraph.bind(this) },null].concat(options);
options.push(null,{content:"Close subgraph", callback: this.closeSubgraph.bind(this) });
}
if(this.getExtraMenuOptions)

41
src/nodes/base.js
View File

@@ -40,14 +40,39 @@ function Subgraph()
this.subgraph.onGlobalOutputRenamed = this.onSubgraphRenamedGlobalOutput.bind(this);
this.subgraph.onGlobalOutputTypeChanged = this.onSubgraphTypeChangeGlobalOutput.bind(this);
this.addWidget("button","Open Graph",null,function( widget, graphcanvas ){ graphcanvas.openSubgraph(that.subgraph) });
this.bgcolor = "#353";
this.color = "#335";
this.bgcolor = "#557";
}
Subgraph.title = "Subgraph";
Subgraph.desc = "Graph inside a node";
Subgraph.prototype.onDrawTitle = function(ctx)
{
if(this.flags.collapsed)
return;
ctx.fillStyle = "#AAA";
var w = LiteGraph.NODE_TITLE_HEIGHT;
var x = this.size[0] - w;
ctx.fillRect( x, -w, w,w );
ctx.fillStyle = "#333";
ctx.beginPath();
ctx.moveTo( x+w*0.2, -w*0.6 );
ctx.lineTo( x+w*0.8, -w*0.6 );
ctx.lineTo( x+w*0.5, -w*0.3 );
ctx.fill();
}
Subgraph.prototype.onMouseDown = function(e,pos,graphcanvas)
{
if( !this.flags.collapsed && pos[0] > this.size[0] - LiteGraph.NODE_TITLE_HEIGHT && pos[1] < 0 )
{
var that = this;
setTimeout(function(){ graphcanvas.openSubgraph( that.subgraph ); },10 );
}
}
Subgraph.prototype.onSubgraphNewGlobalInput = function(name, type)
{
//add input to the node
@@ -109,16 +134,6 @@ Subgraph.prototype.getExtraMenuOptions = function(graphcanvas)
}];
}
Subgraph.prototype.onDrawForeground = function( ctx, graphcanvas )
{
/*
var node = this;
ctx.globalAlpha = 0.75;
graphcanvas.guiButton( ctx, [0,this.size[1] - 20, this.size[0], 19 ], "Open", function(){ graphcanvas.openSubgraph(node.subgraph); });
ctx.globalAlpha = 1;
*/
}
Subgraph.prototype.onResize = function(size)
{
size[1] += 20;