From 973efa842bc20458a5bc7e9ab27d9e0511f81370 Mon Sep 17 00:00:00 2001
From: "Alex \"mcmonkey\" Goodwin" <git_commits@alexgoodwin.dev>
Date: Thu, 26 Sep 2024 17:18:22 +0900
Subject: [PATCH] make hotkey intercompatible with both old and new UI

---
 browser_tests/interaction.spec.ts                    | 4 ++--
 src/components/sidebar/SidebarSettingsToggleIcon.vue | 2 +-
 src/extensions/core/keybinds.ts                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser_tests/interaction.spec.ts b/browser_tests/interaction.spec.ts
index b04c1606..977c5c14 100644
--- a/browser_tests/interaction.spec.ts
+++ b/browser_tests/interaction.spec.ts
@@ -425,9 +425,9 @@ test.describe('Load duplicate workflow', () => {
 
 test.describe('Menu interactions', () => {
   test('Can open settings with hotkey', async ({ comfyPage }) => {
-    await comfyPage.page.keyboard.down('Control')
+    await comfyPage.page.keyboard.down('ControlOrMeta')
     await comfyPage.page.keyboard.press(',')
-    await comfyPage.page.keyboard.up('Control')
+    await comfyPage.page.keyboard.up('ControlOrMeta')
     const settingsLocator = comfyPage.page.locator('.settings-container')
     await expect(settingsLocator).toBeVisible()
     await comfyPage.page.keyboard.press('Escape')
diff --git a/src/components/sidebar/SidebarSettingsToggleIcon.vue b/src/components/sidebar/SidebarSettingsToggleIcon.vue
index 85d93ab3..6dd93797 100644
--- a/src/components/sidebar/SidebarSettingsToggleIcon.vue
+++ b/src/components/sidebar/SidebarSettingsToggleIcon.vue
@@ -1,7 +1,7 @@
 <template>
   <SidebarIcon
     icon="pi pi-cog"
-    class="settings-icon-button"
+    class="comfy-settings-btn"
     @click="showSetting"
     :tooltip="$t('settings')"
   />
diff --git a/src/extensions/core/keybinds.ts b/src/extensions/core/keybinds.ts
index 5aba5d54..d1f4ffd3 100644
--- a/src/extensions/core/keybinds.ts
+++ b/src/extensions/core/keybinds.ts
@@ -42,7 +42,7 @@ app.registerExtension({
         Backspace: '#comfy-clear-button',
         d: '#comfy-load-default-button',
         g: '#comfy-group-selected-nodes-button',
-        ',': '.settings-icon-button'
+        ',': '.comfy-settings-btn'
       }
 
       const modifierKeybindId = modifierKeyIdMap[event.key]