The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Improve node input/widget conversion sub-menus (#3281)
Torbjörn Lönnemarka88b0ebc2d2f
diff --git a/tests-ui/utils/ezgraph.js b/tests-ui/utils/ezgraph.jsindex 8bf8c5d8c..97be7aa72 100644--- a/tests-ui/utils/ezgraph.js+++ b/tests-ui/utils/ezgraph.js@@ -204,7 +204,7 @@ export class EzWidget {convertToWidget() {if (!this.isConvertedToInput)throw new Error(`Widget ${this.widget.name} cannot be converted as it is already a widget.`);- var menu = this.node.menu["Convert 🔘 to widget.."].item.submenu.options;+ var menu = this.node.menu["Convert Input to Widget"].item.submenu.options;var index = menu.findIndex(a => a.content == `Convert ${this.widget.name} to widget`);menu[index].callback.call();}@@ -212,7 +212,7 @@ export class EzWidget {convertToInput() {if (this.isConvertedToInput)throw new Error(`Widget ${this.widget.name} cannot be converted as it is already an input.`);- var menu = this.node.menu["Convert input to 🔘.."].item.submenu.options;+ var menu = this.node.menu["Convert Widget to Input"].item.submenu.options;var index = menu.findIndex(a => a.content == `Convert ${this.widget.name} to input`);menu[index].callback.call();}diff --git a/web/extensions/core/widgetInputs.js b/web/extensions/core/widgetInputs.jsindex e6db9f71a..f1a1d22cd 100644--- a/web/extensions/core/widgetInputs.js+++ b/web/extensions/core/widgetInputs.js@@ -256,8 +256,18 @@ export function mergeIfValid(output, config2, forceUpdate, recreateWidget, confireturn { customConfig };}+let useConversionSubmenusSetting;app.registerExtension({name: "Comfy.WidgetInputs",+ init() {+ useConversionSubmenusSetting = app.ui.settings.addSetting({+ id: "Comfy.NodeInputConversionSubmenus",+ name: "Node widget/input conversion sub-menus",+ tooltip: "In the node context menu, place the entries that convert between input/widget in sub-menus.",+ type: "boolean",+ defaultValue: true,+ });+ },async beforeRegisterNodeDef(nodeType, nodeData, app) {// Add menu options to conver to/from widgetsconst origGetExtraMenuOptions = nodeType.prototype.getExtraMenuOptions;@@ -295,20 +305,28 @@ app.registerExtension({//Convert.. main menuif (toInput.length) {- options.push({- content: `Convert input to 🔘..`,- submenu: {- options: toInput,- },- });+ if (useConversionSubmenusSetting.value) {+ options.push({+ content: "Convert Widget to Input",+ submenu: {+ options: toInput,+ },+ });+ } else {+ options.push(...toInput, null);+ }}if (toWidget.length) {- options.push({- content: `Convert 🔘 to widget..`,- submenu: {- options: toWidget,- },- });+ if (useConversionSubmenusSetting.value) {+ options.push({+ content: "Convert Input to Widget",+ submenu: {+ options: toWidget,+ },+ });+ } else {+ options.push(...toWidget, null);+ }}}