neuro_llc/ComfyBox
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix rendering outline for nodes with no title

Browse Source
This commit is contained in:
space-nuko
2023-05-20 10:43:14 -05:00
parent 238128b6eb
commit 7a2bc988ee
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/lib/ComfyGraphCanvas.ts
View File

@@ -98,7 +98,7 @@ export default class ComfyGraphCanvas extends LGraphCanvas {
} }
if (color) { if (color) {
this.drawNodeOutline(node, ctx, size, fgColor, bgColor, color, thickness) this.drawNodeOutline(node, ctx, size, mouseOver, fgColor, bgColor, color, thickness)
} }
if (isRunningNode && state.progress) { if (isRunningNode && state.progress) {
@@ -108,27 +108,36 @@ export default class ComfyGraphCanvas extends LGraphCanvas {
} }
} }
private drawNodeOutline(node: LGraphNode, ctx: CanvasRenderingContext2D, size: Vector2, fgColor: string, bgColor: string, outlineColor: string, outlineThickness: number) { private drawNodeOutline(node: LGraphNode, ctx: CanvasRenderingContext2D, size: Vector2, mouseOver: boolean, fgColor: string, bgColor: string, outlineColor: string, outlineThickness: number) {
const shape = node.shape || BuiltInSlotShape.ROUND_SHAPE; const shape = node.shape || BuiltInSlotShape.ROUND_SHAPE;
var render_title = true;
if (node.titleMode == TitleMode.TRANSPARENT_TITLE || node.titleMode == TitleMode.NO_TITLE) {
render_title = false;
} else if (node.titleMode == TitleMode.AUTOHIDE_TITLE && mouseOver) {
render_title = true;
}
const titleHeight = render_title ? LiteGraph.NODE_TITLE_HEIGHT : 0;
ctx.lineWidth = outlineThickness; ctx.lineWidth = outlineThickness;
ctx.globalAlpha = 0.8; ctx.globalAlpha = 0.8;
ctx.beginPath(); ctx.beginPath();
if (shape == BuiltInSlotShape.BOX_SHAPE) if (shape == BuiltInSlotShape.BOX_SHAPE)
ctx.rect(-6, -6 + LiteGraph.NODE_TITLE_HEIGHT, 12 + size[0] + 1, 12 + size[1] + LiteGraph.NODE_TITLE_HEIGHT); ctx.rect(-6, -6 + titleHeight, 12 + size[0] + 1, 12 + size[1] + titleHeight);
else if (shape == BuiltInSlotShape.ROUND_SHAPE || (shape == BuiltInSlotShape.CARD_SHAPE && node.flags.collapsed)) else if (shape == BuiltInSlotShape.ROUND_SHAPE || (shape == BuiltInSlotShape.CARD_SHAPE && node.flags.collapsed))
ctx.roundRect( ctx.roundRect(
-6, -6,
-6 - LiteGraph.NODE_TITLE_HEIGHT, -6 - titleHeight,
12 + size[0] + 1, 12 + size[0] + 1,
12 + size[1] + LiteGraph.NODE_TITLE_HEIGHT, 12 + size[1] + titleHeight,
this.round_radius * 2 this.round_radius * 2
); );
else if (shape == BuiltInSlotShape.CARD_SHAPE) else if (shape == BuiltInSlotShape.CARD_SHAPE)
ctx.roundRect( ctx.roundRect(
-6, -6,
-6 + LiteGraph.NODE_TITLE_HEIGHT, -6 + titleHeight,
12 + size[0] + 1, 12 + size[0] + 1,
12 + size[1] + LiteGraph.NODE_TITLE_HEIGHT, 12 + size[1] + titleHeight,
this.round_radius * 2, this.round_radius * 2,
2 2
); );