mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-01-07 12:50:49 +08:00
Merge branch 'comfyanonymous:master' into refactor/execution
This commit is contained in:
commit
5325e90352
@ -7294,10 +7294,6 @@ LGraphNode.prototype.executeAction = function(action)
|
||||
if (this.onShowNodePanel) {
|
||||
this.onShowNodePanel(n);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.showShowNodePanel(n);
|
||||
}
|
||||
|
||||
if (this.onNodeDblClicked) {
|
||||
this.onNodeDblClicked(n);
|
||||
@ -8099,11 +8095,15 @@ LGraphNode.prototype.executeAction = function(action)
|
||||
bgcolor = bgcolor || LiteGraph.NODE_DEFAULT_COLOR;
|
||||
hovercolor = hovercolor || "#555";
|
||||
textcolor = textcolor || LiteGraph.NODE_TEXT_COLOR;
|
||||
var yFix = y + LiteGraph.NODE_TITLE_HEIGHT + 2; // fix the height with the title
|
||||
var pos = this.mouse;
|
||||
var hover = LiteGraph.isInsideRectangle( pos[0], pos[1], x,yFix,w,h );
|
||||
pos = this.last_click_position;
|
||||
var clicked = pos && LiteGraph.isInsideRectangle( pos[0], pos[1], x,yFix,w,h );
|
||||
var pos = this.ds.convertOffsetToCanvas(this.graph_mouse);
|
||||
var hover = LiteGraph.isInsideRectangle( pos[0], pos[1], x,y,w,h );
|
||||
pos = this.last_click_position ? [this.last_click_position[0], this.last_click_position[1]] : null;
|
||||
if(pos) {
|
||||
var rect = this.canvas.getBoundingClientRect();
|
||||
pos[0] -= rect.left;
|
||||
pos[1] -= rect.top;
|
||||
}
|
||||
var clicked = pos && LiteGraph.isInsideRectangle( pos[0], pos[1], x,y,w,h );
|
||||
|
||||
ctx.fillStyle = hover ? hovercolor : bgcolor;
|
||||
if(clicked)
|
||||
@ -13067,6 +13067,10 @@ LGraphNode.prototype.executeAction = function(action)
|
||||
has_submenu: true,
|
||||
callback: LGraphCanvas.onShowMenuNodeProperties
|
||||
},
|
||||
{
|
||||
content: "Properties Panel",
|
||||
callback: function(item, options, e, menu, node) { LGraphCanvas.active_canvas.showShowNodePanel(node) }
|
||||
},
|
||||
null,
|
||||
{
|
||||
content: "Title",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user