From e3ab0e4d68116aa68408b0fc72a86cdaa45158d0 Mon Sep 17 00:00:00 2001 From: filtered <176114999+webfiltered@users.noreply.github.com> Date: Mon, 27 Jan 2025 22:56:40 +1100 Subject: [PATCH] Add option to disable combo box zoom-in scaling (#2362) Co-authored-by: github-actions --- src/components/graph/GraphCanvas.vue | 6 ++++++ src/constants/coreSettings.ts | 7 +++++++ src/locales/en/main.json | 3 ++- src/locales/en/settings.json | 3 +++ src/locales/fr/main.json | 1 + src/locales/fr/settings.json | 3 +++ src/locales/ja/main.json | 1 + src/locales/ja/settings.json | 3 +++ src/locales/ko/main.json | 1 + src/locales/ko/settings.json | 3 +++ src/locales/ru/main.json | 1 + src/locales/ru/settings.json | 3 +++ src/locales/zh/main.json | 1 + src/locales/zh/settings.json | 3 +++ 14 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/components/graph/GraphCanvas.vue b/src/components/graph/GraphCanvas.vue index c38221abd..c83621e3f 100644 --- a/src/components/graph/GraphCanvas.vue +++ b/src/components/graph/GraphCanvas.vue @@ -246,6 +246,12 @@ watch( } ) +watchEffect(() => { + LiteGraph.context_menu_scaling = settingStore.get( + 'LiteGraph.ContextMenu.Scaling' + ) +}) + usePragmaticDroppable(() => canvasRef.value, { getDropEffect: (args): Exclude => args.source.data.type === 'tree-explorer-node' ? 'copy' : 'move', diff --git a/src/constants/coreSettings.ts b/src/constants/coreSettings.ts index 4eba1aeb7..6c191c92d 100644 --- a/src/constants/coreSettings.ts +++ b/src/constants/coreSettings.ts @@ -715,5 +715,12 @@ export const CORE_SETTINGS: SettingParams[] = [ type: 'hidden', defaultValue: false, versionAdded: '1.8.7' + }, + { + id: 'LiteGraph.ContextMenu.Scaling', + name: 'Scale node combo widget menus (lists) when zoomed in', + defaultValue: false, + type: 'boolean', + versionAdded: '1.8.8' } ] diff --git a/src/locales/en/main.json b/src/locales/en/main.json index af8d9fa7d..0f0399d34 100644 --- a/src/locales/en/main.json +++ b/src/locales/en/main.json @@ -471,7 +471,8 @@ "Server-Config": "Server-Config", "About": "About", "EditTokenWeight": "Edit Token Weight", - "CustomColorPalettes": "Custom Color Palettes" + "CustomColorPalettes": "Custom Color Palettes", + "ContextMenu": "Context Menu" }, "serverConfigItems": { "listen": { diff --git a/src/locales/en/settings.json b/src/locales/en/settings.json index 91a7e4701..b9d57557c 100644 --- a/src/locales/en/settings.json +++ b/src/locales/en/settings.json @@ -309,6 +309,9 @@ "name": "Maxium FPS", "tooltip": "The maximum frames per second that the canvas is allowed to render. Caps GPU usage at the cost of smoothness. If 0, the screen refresh rate is used. Default: 0" }, + "LiteGraph_ContextMenu_Scaling": { + "name": "Scale node combo widget menus (lists) when zoomed in" + }, "pysssss_SnapToGrid": { "name": "Always snap to grid" } diff --git a/src/locales/fr/main.json b/src/locales/fr/main.json index 19489a6ee..c867d66eb 100644 --- a/src/locales/fr/main.json +++ b/src/locales/fr/main.json @@ -603,6 +603,7 @@ "ColorPalette": "Palette de Couleurs", "Comfy": "Confort", "Comfy-Desktop": "Comfy-Desktop", + "ContextMenu": "Menu Contextuel", "CustomColorPalettes": "Palettes de Couleurs Personnalisées", "DevMode": "Mode Développeur", "EditTokenWeight": "Modifier le Poids du Jeton", diff --git a/src/locales/fr/settings.json b/src/locales/fr/settings.json index bce7b6165..c0e50351c 100644 --- a/src/locales/fr/settings.json +++ b/src/locales/fr/settings.json @@ -309,6 +309,9 @@ "name": "FPS maximum", "tooltip": "Le nombre maximum d'images par seconde que le canevas est autorisé à rendre. Limite l'utilisation du GPU au détriment de la fluidité. Si 0, le taux de rafraîchissement de l'écran est utilisé. Par défaut : 0" }, + "LiteGraph_ContextMenu_Scaling": { + "name": "Mise à l'échelle des menus de widgets combinés de nœuds (listes) lors du zoom" + }, "pysssss_SnapToGrid": { "name": "Toujours aligner sur la grille" } diff --git a/src/locales/ja/main.json b/src/locales/ja/main.json index 30a98f4c8..945382a74 100644 --- a/src/locales/ja/main.json +++ b/src/locales/ja/main.json @@ -603,6 +603,7 @@ "ColorPalette": "カラーパレット", "Comfy": "Comfy", "Comfy-Desktop": "Comfyデスクトップ", + "ContextMenu": "コンテキストメニュー", "CustomColorPalettes": "カスタムカラーパレット", "DevMode": "開発モード", "EditTokenWeight": "トークンの重みを編集", diff --git a/src/locales/ja/settings.json b/src/locales/ja/settings.json index c24b1e4bf..0203f5150 100644 --- a/src/locales/ja/settings.json +++ b/src/locales/ja/settings.json @@ -309,6 +309,9 @@ "name": "最大FPS", "tooltip": "キャンバスがレンダリングできる最大フレーム数です。スムーズさの代わりにGPU使用量を制限します。0の場合、画面のリフレッシュレートが使用されます。デフォルト：0" }, + "LiteGraph_ContextMenu_Scaling": { + "name": "ズームイン時にノードコンボウィジェットメニュー（リスト）をスケーリングする" + }, "pysssss_SnapToGrid": { "name": "常にグリッドにスナップ" } diff --git a/src/locales/ko/main.json b/src/locales/ko/main.json index 01670faba..854ce3b21 100644 --- a/src/locales/ko/main.json +++ b/src/locales/ko/main.json @@ -603,6 +603,7 @@ "ColorPalette": "색상 팔레트", "Comfy": "Comfy", "Comfy-Desktop": "Comfy-Desktop", + "ContextMenu": "컨텍스트 메뉴", "CustomColorPalettes": "사용자 정의 색상 팔레트", "DevMode": "개발자 모드", "EditTokenWeight": "토큰 가중치 편집", diff --git a/src/locales/ko/settings.json b/src/locales/ko/settings.json index 379214f3a..8fde8be96 100644 --- a/src/locales/ko/settings.json +++ b/src/locales/ko/settings.json @@ -309,6 +309,9 @@ "name": "최대 FPS", "tooltip": "캔버스가 렌더링할 수 있는 최대 프레임 수입니다. 부드럽게 동작하도록 GPU 사용률을 제한 합니다. 0이면 화면 주사율로 작동 합니다. 기본값: 0" }, + "LiteGraph_ContextMenu_Scaling": { + "name": "확대시 노드 콤보 위젯 메뉴 (목록) 스케일링" + }, "pysssss_SnapToGrid": { "name": "항상 그리드에 스냅" } diff --git a/src/locales/ru/main.json b/src/locales/ru/main.json index 415012e98..e2add40fd 100644 --- a/src/locales/ru/main.json +++ b/src/locales/ru/main.json @@ -603,6 +603,7 @@ "ColorPalette": "Цветовая палитра", "Comfy": "Comfy", "Comfy-Desktop": "Десктопный Comfy", + "ContextMenu": "Контекстное меню", "CustomColorPalettes": "Пользовательские цветовые палитры", "DevMode": "Режим разработчика", "EditTokenWeight": "Редактировать вес токена", diff --git a/src/locales/ru/settings.json b/src/locales/ru/settings.json index d530dfd75..659060a8d 100644 --- a/src/locales/ru/settings.json +++ b/src/locales/ru/settings.json @@ -309,6 +309,9 @@ "name": "Максимум FPS", "tooltip": "Максимальное количество кадров в секунду, которое холст может рендерить. Ограничивает использование GPU за счёт плавности. Если 0, используется частота обновления экрана. По умолчанию: 0" }, + "LiteGraph_ContextMenu_Scaling": { + "name": "Масштабирование комбинированных виджетов меню узлов (списков) при увеличении" + }, "pysssss_SnapToGrid": { "name": "Всегда привязываться к сетке" } diff --git a/src/locales/zh/main.json b/src/locales/zh/main.json index ecd3cef25..0c563d102 100644 --- a/src/locales/zh/main.json +++ b/src/locales/zh/main.json @@ -603,6 +603,7 @@ "ColorPalette": "色彩主题", "Comfy": "Comfy", "Comfy-Desktop": "Comfy桌面版", + "ContextMenu": "上下文菜单", "CustomColorPalettes": "自定义色彩主题", "DevMode": "开发模式", "EditTokenWeight": "编辑令牌权重", diff --git a/src/locales/zh/settings.json b/src/locales/zh/settings.json index e34173e0a..d558f4a6d 100644 --- a/src/locales/zh/settings.json +++ b/src/locales/zh/settings.json @@ -309,6 +309,9 @@ "name": "最大FPS", "tooltip": "画布允许渲染的最大帧数。限制GPU使用以换取流畅度。如果为0，则使用屏幕刷新率。默认值：0" }, + "LiteGraph_ContextMenu_Scaling": { + "name": "放大时缩放节点组合部件菜单（列表）" + }, "pysssss_SnapToGrid": { "name": "始终吸附到网格" }