diff --git a/src/composables/useLitegraphSettings.ts b/src/composables/useLitegraphSettings.ts index d1e75f9bde..ddb97f634b 100644 --- a/src/composables/useLitegraphSettings.ts +++ b/src/composables/useLitegraphSettings.ts @@ -122,4 +122,10 @@ export const useLitegraphSettings = () => { 'LiteGraph.Reroute.SplineOffset' ) }) + + watchEffect(() => { + LiteGraph.macTrackpadGestures = settingStore.get( + 'LiteGraph.Pointer.TrackpadGestures' + ) + }) } diff --git a/src/constants/coreSettings.ts b/src/constants/coreSettings.ts index dc2743be94..27a530667f 100644 --- a/src/constants/coreSettings.ts +++ b/src/constants/coreSettings.ts @@ -817,5 +817,16 @@ export const CORE_SETTINGS: SettingParams[] = [ type: 'boolean', defaultValue: false, versionAdded: '1.18.0' + }, + { + id: 'LiteGraph.Pointer.TrackpadGestures', + category: ['LiteGraph', 'Pointer', 'Trackpad Gestures'], + experimental: true, + name: 'Enable trackpad gestures', + tooltip: + 'This setting enables trackpad mode for the canvas, allowing pinch-to-zoom and panning with two fingers.', + type: 'boolean', + defaultValue: false, + versionAdded: '1.19.1' } ] diff --git a/src/locales/en/settings.json b/src/locales/en/settings.json index 23fdfbcb71..779f1cbcd8 100644 --- a/src/locales/en/settings.json +++ b/src/locales/en/settings.json @@ -387,6 +387,10 @@ "LiteGraph_Node_TooltipDelay": { "name": "Tooltip Delay" }, + "LiteGraph_Pointer_TrackpadGestures": { + "name": "Enable trackpad gestures", + "tooltip": "This setting enables trackpad mode for the canvas, allowing pinch-to-zoom and panning with two fingers." + }, "LiteGraph_Reroute_SplineOffset": { "name": "Reroute spline offset", "tooltip": "The bezier control point offset from the reroute centre point" diff --git a/src/locales/es/settings.json b/src/locales/es/settings.json index 87978e20d6..6bef6d059e 100644 --- a/src/locales/es/settings.json +++ b/src/locales/es/settings.json @@ -387,6 +387,10 @@ "LiteGraph_Node_TooltipDelay": { "name": "Retraso de la información sobre herramientas" }, + "LiteGraph_Pointer_TrackpadGestures": { + "name": "Habilitar gestos del trackpad", + "tooltip": "Esta configuración activa el modo trackpad para el lienzo, permitiendo hacer zoom con pellizco y desplazar con dos dedos." + }, "LiteGraph_Reroute_SplineOffset": { "name": "Desvío de la compensación de la spline", "tooltip": "El punto de control bezier desplazado desde el punto central de reenrutamiento" diff --git a/src/locales/fr/settings.json b/src/locales/fr/settings.json index 364828fbb6..f86ee2e6d6 100644 --- a/src/locales/fr/settings.json +++ b/src/locales/fr/settings.json @@ -387,6 +387,10 @@ "LiteGraph_Node_TooltipDelay": { "name": "Délai d'infobulle" }, + "LiteGraph_Pointer_TrackpadGestures": { + "name": "Activer les gestes du trackpad", + "tooltip": "Ce paramètre active le mode trackpad pour le canevas, permettant le zoom par pincement et le déplacement à deux doigts." + }, "LiteGraph_Reroute_SplineOffset": { "name": "Réacheminement décalage de spline", "tooltip": "Le point de contrôle de Bézier est décalé par rapport au point central de réacheminement" diff --git a/src/locales/ja/settings.json b/src/locales/ja/settings.json index 7af19f9e25..5cc75653dc 100644 --- a/src/locales/ja/settings.json +++ b/src/locales/ja/settings.json @@ -387,6 +387,10 @@ "LiteGraph_Node_TooltipDelay": { "name": "ツールチップ遅延" }, + "LiteGraph_Pointer_TrackpadGestures": { + "name": "トラックパッドジェスチャーを有効にする", + "tooltip": "この設定を有効にすると、キャンバスでトラックパッドモードが有効になり、ピンチズームや2本指でのパン操作が可能になります。" + }, "LiteGraph_Reroute_SplineOffset": { "name": "リルートスプラインオフセット", "tooltip": "リルート中心点からのベジエ制御点のオフセット" diff --git a/src/locales/ko/settings.json b/src/locales/ko/settings.json index cfa940fb6e..cc8f86f046 100644 --- a/src/locales/ko/settings.json +++ b/src/locales/ko/settings.json @@ -387,6 +387,10 @@ "LiteGraph_Node_TooltipDelay": { "name": "툴팁 지연" }, + "LiteGraph_Pointer_TrackpadGestures": { + "name": "트랙패드 제스처 활성화", + "tooltip": "이 설정을 켜면 캔버스에서 트랙패드 모드를 사용할 수 있으며, 두 손가락으로 확대/축소 및 이동이 가능합니다." + }, "LiteGraph_Reroute_SplineOffset": { "name": "경유점 스플라인 오프셋", "tooltip": "경유점 중심에서 베지어 제어점까지의 오프셋" diff --git a/src/locales/ru/settings.json b/src/locales/ru/settings.json index 9fcd8bd4fa..4004e856b2 100644 --- a/src/locales/ru/settings.json +++ b/src/locales/ru/settings.json @@ -387,6 +387,10 @@ "LiteGraph_Node_TooltipDelay": { "name": "Задержка всплывающей подсказки" }, + "LiteGraph_Pointer_TrackpadGestures": { + "name": "Включить жесты трекпада", + "tooltip": "Эта настройка включает режим трекпада для холста, позволяя использовать масштабирование щипком и панорамирование двумя пальцами." + }, "LiteGraph_Reroute_SplineOffset": { "name": "Перераспределение смещения сплайна", "tooltip": "Смещение контрольной точки Безье от центральной точки перераспределения" diff --git a/src/locales/zh/settings.json b/src/locales/zh/settings.json index d05955ee95..737eb2440f 100644 --- a/src/locales/zh/settings.json +++ b/src/locales/zh/settings.json @@ -387,6 +387,10 @@ "LiteGraph_Node_TooltipDelay": { "name": "工具提示延迟" }, + "LiteGraph_Pointer_TrackpadGestures": { + "name": "启用触控板手势", + "tooltip": "此设置为画布启用触控板模式，允许使用双指捏合缩放和拖动。" + }, "LiteGraph_Reroute_SplineOffset": { "name": "重新路由样条偏移", "tooltip": "贝塞尔控制点从重新路由中心点的偏移" diff --git a/src/schemas/apiSchema.ts b/src/schemas/apiSchema.ts index 5d395d486c..c6419ad483 100644 --- a/src/schemas/apiSchema.ts +++ b/src/schemas/apiSchema.ts @@ -456,7 +456,8 @@ const zSettings = z.object({ 'test.setting': z.any(), 'main.sub.setting.name': z.any(), 'single.setting': z.any(), - 'LiteGraph.Node.DefaultPadding': z.boolean() + 'LiteGraph.Node.DefaultPadding': z.boolean(), + 'LiteGraph.Pointer.TrackpadGestures': z.boolean() }) export type EmbeddingsResponse = z.infer diff --git a/src/scripts/app.ts b/src/scripts/app.ts index b2a8ef08cc..8d2550c96a 100644 --- a/src/scripts/app.ts +++ b/src/scripts/app.ts @@ -760,6 +760,7 @@ export class ComfyApp { this.ctx = canvasEl.getContext('2d') LiteGraph.alt_drag_do_clone_nodes = true + LiteGraph.macGesturesRequireMac = false this.graph.start()