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

fix in roundRect

Browse Source
This commit is contained in:
tamat
2020-04-27 00:22:24 +02:00
parent c54e6ca3bb
commit 22190622b4
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/litegraph.js
View File

@@ -10196,8 +10196,8 @@ LGraphNode.prototype.executeAction = function(action)
//API *************************************************
//like rect but rounded corners
if (global.CanvasRenderingContext2D) {
global.CanvasRenderingContext2D.prototype.roundRect = function(
if (typeof(window) != "undefined" && window.CanvasRenderingContext2D) {
window.CanvasRenderingContext2D.prototype.roundRect = function(
x,
y,
width,

8
build/litegraph.min.js vendored
View File

@@ -228,10 +228,10 @@ callback:e.onShowMenuNodeProperties},null,{content:"Title",callback:e.onShowProp
callback:e.onMenuNodeColors},{content:"Font size",property:"font_size",type:"Number",callback:e.onShowPropertyEditor},null,{content:"Remove",callback:e.onMenuNodeRemove}]};e.prototype.processContextMenu=function(a,b){var d=this,g=e.active_canvas.getCanvasWindow(),f=null,c={event:b,callback:function(b,f,g){if(b)if("Remove Slot"==b.content)b=b.slot,b.input?a.removeInput(b.slot):b.output&&a.removeOutput(b.slot);else if("Disconnect Links"==b.content)b=b.slot,b.output?a.disconnectOutput(b.slot):b.input&&
a.disconnectInput(b.slot);else if("Rename Slot"==b.content){b=b.slot;var c=b.input?a.getInputInfo(b.slot):a.getOutputInfo(b.slot),h=d.createDialog("<span class='name'>Name</span><input autofocus type='text'/><button>OK</button>",f),k=h.querySelector("input");k&&c&&(k.value=c.label||"");h.querySelector("button").addEventListener("click",function(a){k.value&&(c&&(c.label=k.value),d.setDirty(!0));h.close()})}},extra:a};a&&(c.title=a.type);var k=null;a&&(k=a.getSlotInPosition(b.canvasX,b.canvasY),e.active_node=
a);if(k){f=[];k&&k.output&&k.output.links&&k.output.links.length&&f.push({content:"Disconnect Links",slot:k});var p=k.input||k.output;f.push(p.locked?"Cannot remove":{content:"Remove Slot",slot:k});f.push(p.nameLocked?"Cannot rename":{content:"Rename Slot",slot:k});c.title=(k.input?k.input.type:k.output.type)||"*";k.input&&k.input.type==h.ACTION&&(c.title="Action");k.output&&k.output.type==h.EVENT&&(c.title="Event")}else a?f=this.getNodeMenuOptions(a):(f=this.getCanvasMenuOptions(),(k=this.graph.getGroupOnPos(b.canvasX,
b.canvasY))&&f.push(null,{content:"Edit Group",has_submenu:!0,submenu:{title:"Group",extra:k,options:this.getGroupMenuOptions(k)}}));f&&new h.ContextMenu(f,c,g)};B.CanvasRenderingContext2D&&(B.CanvasRenderingContext2D.prototype.roundRect=function(a,b,d,g,f,c){void 0===f&&(f=5);void 0===c&&(c=f);this.moveTo(a+f,b);this.lineTo(a+d-f,b);this.quadraticCurveTo(a+d,b,a+d,b+f);this.lineTo(a+d,b+g-c);this.quadraticCurveTo(a+d,b+g,a+d-c,b+g);this.lineTo(a+c,b+g);this.quadraticCurveTo(a,b+g,a,b+g-c);this.lineTo(a,
b+f);this.quadraticCurveTo(a,b,a+f,b)});h.compareObjects=function(a,b){for(var d in a)if(a[d]!=b[d])return!1;return!0};h.distance=C;h.colorToString=function(a){return"rgba("+Math.round(255*a[0]).toFixed()+","+Math.round(255*a[1]).toFixed()+","+Math.round(255*a[2]).toFixed()+","+(4==a.length?a[3].toFixed(2):"1.0")+")"};h.isInsideRectangle=w;h.growBounding=function(a,b,d){b<a[0]?a[0]=b:b>a[2]&&(a[2]=b);d<a[1]?a[1]=d:d>a[3]&&(a[3]=d)};h.isInsideBounding=function(a,b){return a[0]<b[0][0]||a[1]<b[0][1]||
a[0]>b[1][0]||a[1]>b[1][1]?!1:!0};h.overlapBounding=u;h.hex2num=function(a){"#"==a.charAt(0)&&(a=a.slice(1));a=a.toUpperCase();for(var b=Array(3),d=0,g,f,c=0;6>c;c+=2)g="0123456789ABCDEF".indexOf(a.charAt(c)),f="0123456789ABCDEF".indexOf(a.charAt(c+1)),b[d]=16*g+f,d++;return b};h.num2hex=function(a){for(var b="#",d,g,f=0;3>f;f++)d=a[f]/16,g=a[f]%16,b+="0123456789ABCDEF".charAt(d)+"0123456789ABCDEF".charAt(g);return b};D.prototype.addItem=function(a,b,d){function g(a){var b=this.value;b&&b.has_submenu&&
f.call(this,a)}function f(a){var b=this.value,f=!0;c.current_submenu&&c.current_submenu.close(a);if(d.callback){var g=d.callback.call(this,b,d,a,c,d.node);!0===g&&(f=!1)}if(b&&(b.callback&&!d.ignore_item_callbacks&&!0!==b.disabled&&(g=b.callback.call(this,b,d,a,c,d.extra),!0===g&&(f=!1)),b.submenu)){if(!b.submenu.options)throw"ContextMenu submenu needs options";new c.constructor(b.submenu.options,{callback:b.submenu.callback,event:a,parentMenu:c,ignore_item_callbacks:b.submenu.ignore_item_callbacks,
b.canvasY))&&f.push(null,{content:"Edit Group",has_submenu:!0,submenu:{title:"Group",extra:k,options:this.getGroupMenuOptions(k)}}));f&&new h.ContextMenu(f,c,g)};"undefined"!=typeof window&&window.CanvasRenderingContext2D&&(window.CanvasRenderingContext2D.prototype.roundRect=function(a,b,d,g,f,c){void 0===f&&(f=5);void 0===c&&(c=f);this.moveTo(a+f,b);this.lineTo(a+d-f,b);this.quadraticCurveTo(a+d,b,a+d,b+f);this.lineTo(a+d,b+g-c);this.quadraticCurveTo(a+d,b+g,a+d-c,b+g);this.lineTo(a+c,b+g);this.quadraticCurveTo(a,
b+g,a,b+g-c);this.lineTo(a,b+f);this.quadraticCurveTo(a,b,a+f,b)});h.compareObjects=function(a,b){for(var d in a)if(a[d]!=b[d])return!1;return!0};h.distance=C;h.colorToString=function(a){return"rgba("+Math.round(255*a[0]).toFixed()+","+Math.round(255*a[1]).toFixed()+","+Math.round(255*a[2]).toFixed()+","+(4==a.length?a[3].toFixed(2):"1.0")+")"};h.isInsideRectangle=w;h.growBounding=function(a,b,d){b<a[0]?a[0]=b:b>a[2]&&(a[2]=b);d<a[1]?a[1]=d:d>a[3]&&(a[3]=d)};h.isInsideBounding=function(a,b){return a[0]<
b[0][0]||a[1]<b[0][1]||a[0]>b[1][0]||a[1]>b[1][1]?!1:!0};h.overlapBounding=u;h.hex2num=function(a){"#"==a.charAt(0)&&(a=a.slice(1));a=a.toUpperCase();for(var b=Array(3),d=0,g,f,c=0;6>c;c+=2)g="0123456789ABCDEF".indexOf(a.charAt(c)),f="0123456789ABCDEF".indexOf(a.charAt(c+1)),b[d]=16*g+f,d++;return b};h.num2hex=function(a){for(var b="#",d,g,f=0;3>f;f++)d=a[f]/16,g=a[f]%16,b+="0123456789ABCDEF".charAt(d)+"0123456789ABCDEF".charAt(g);return b};D.prototype.addItem=function(a,b,d){function g(a){var b=
this.value;b&&b.has_submenu&&f.call(this,a)}function f(a){var b=this.value,f=!0;c.current_submenu&&c.current_submenu.close(a);if(d.callback){var g=d.callback.call(this,b,d,a,c,d.node);!0===g&&(f=!1)}if(b&&(b.callback&&!d.ignore_item_callbacks&&!0!==b.disabled&&(g=b.callback.call(this,b,d,a,c,d.extra),!0===g&&(f=!1)),b.submenu)){if(!b.submenu.options)throw"ContextMenu submenu needs options";new c.constructor(b.submenu.options,{callback:b.submenu.callback,event:a,parentMenu:c,ignore_item_callbacks:b.submenu.ignore_item_callbacks,
title:b.submenu.title,extra:b.submenu.extra,autoopen:d.autoopen});f=!1}f&&!c.lock&&c.close()}var c=this;d=d||{};var h=document.createElement("div");h.className="litemenu-entry submenu";var k=!1;if(null===b)h.classList.add("separator");else{h.innerHTML=b&&b.title?b.title:a;if(h.value=b)b.disabled&&(k=!0,h.classList.add("disabled")),(b.submenu||b.has_submenu)&&h.classList.add("has_submenu");"function"==typeof b?(h.dataset.value=a,h.onclick_callback=b):h.dataset.value=b;b.className&&(h.className+=" "+
b.className)}this.root.appendChild(h);k||h.addEventListener("click",f);d.autoopen&&h.addEventListener("mouseenter",g);return h};D.prototype.close=function(a,b){this.root.parentNode&&this.root.parentNode.removeChild(this.root);this.parentMenu&&!b&&(this.parentMenu.lock=!1,this.parentMenu.current_submenu=null,void 0===a?this.parentMenu.close():a&&!D.isCursorOverElement(a,this.parentMenu.root)&&D.trigger(this.parentMenu.root,"mouseleave",a));this.current_submenu&&this.current_submenu.close(a,!0);this.root.closing_timer&&
clearTimeout(this.root.closing_timer)};D.trigger=function(a,b,d,g){var f=document.createEvent("CustomEvent");f.initCustomEvent(b,!0,!0,d);f.srcElement=g;a.dispatchEvent?a.dispatchEvent(f):a.__events&&a.__events.dispatchEvent(f);return f};D.prototype.getTopMenu=function(){return this.options.parentMenu?this.options.parentMenu.getTopMenu():this};D.prototype.getFirstEvent=function(){return this.options.parentMenu?this.options.parentMenu.getFirstEvent():this.options.event};D.isCursorOverElement=function(a,

4
src/litegraph.js
View File

@@ -10194,8 +10194,8 @@ LGraphNode.prototype.executeAction = function(action)
//API *************************************************
//like rect but rounded corners
if (global.CanvasRenderingContext2D) {
global.CanvasRenderingContext2D.prototype.roundRect = function(
if (typeof(window) != "undefined" && window.CanvasRenderingContext2D) {
window.CanvasRenderingContext2D.prototype.roundRect = function(
x,
y,
width,