From ad87080e8c6ee62a9d1a9088dfac50c12be3a154 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sat, 11 Jan 2025 16:50:22 +1100
Subject: [PATCH 01/19] Revert "[Desktop] Fix server start view layout (#2226)"

This reverts commit 44610674ee51d00d2528492da3fca3a1c4b51ff5.
---
 src/views/ServerStartView.vue | 68 +++++++++++++++++------------------
 vite.electron.config.mts      |  6 +---
 2 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/src/views/ServerStartView.vue b/src/views/ServerStartView.vue
index 39c5e1a7b..069f9ab1a 100644
--- a/src/views/ServerStartView.vue
+++ b/src/views/ServerStartView.vue
@@ -1,45 +1,43 @@
 <template>
   <BaseViewTemplate dark class="flex-col">
-    <div class="flex flex-col w-full h-full items-center">
-      <h2 class="text-2xl font-bold">
-        {{ t(`serverStart.process.${status}`) }}
-        <span v-if="status === ProgressStatus.ERROR">
-          v{{ electronVersion }}
-        </span>
-      </h2>
-      <div
-        v-if="status === ProgressStatus.ERROR"
-        class="flex flex-col items-center gap-4"
-      >
-        <div class="flex items-center my-4 gap-2">
-          <Button
-            icon="pi pi-flag"
-            severity="secondary"
-            :label="t('serverStart.reportIssue')"
-            @click="reportIssue"
-          />
-          <Button
-            icon="pi pi-file"
-            severity="secondary"
-            :label="t('serverStart.openLogs')"
-            @click="openLogs"
-          />
-          <Button
-            icon="pi pi-refresh"
-            :label="t('serverStart.reinstall')"
-            @click="reinstall"
-          />
-        </div>
+    <h2 class="text-2xl font-bold">
+      {{ t(`serverStart.process.${status}`) }}
+      <span v-if="status === ProgressStatus.ERROR">
+        v{{ electronVersion }}
+      </span>
+    </h2>
+    <div
+      v-if="status === ProgressStatus.ERROR"
+      class="flex flex-col items-center gap-4"
+    >
+      <div class="flex items-center my-4 gap-2">
         <Button
-          v-if="!terminalVisible"
-          icon="pi pi-search"
+          icon="pi pi-flag"
           severity="secondary"
-          :label="t('serverStart.showTerminal')"
-          @click="terminalVisible = true"
+          :label="t('serverStart.reportIssue')"
+          @click="reportIssue"
+        />
+        <Button
+          icon="pi pi-file"
+          severity="secondary"
+          :label="t('serverStart.openLogs')"
+          @click="openLogs"
+        />
+        <Button
+          icon="pi pi-refresh"
+          :label="t('serverStart.reinstall')"
+          @click="reinstall"
         />
       </div>
-      <BaseTerminal v-show="terminalVisible" @created="terminalCreated" />
+      <Button
+        v-if="!terminalVisible"
+        icon="pi pi-search"
+        severity="secondary"
+        :label="t('serverStart.showTerminal')"
+        @click="terminalVisible = true"
+      />
     </div>
+    <BaseTerminal v-show="terminalVisible" @created="terminalCreated" />
   </BaseViewTemplate>
 </template>
 
diff --git a/vite.electron.config.mts b/vite.electron.config.mts
index 821919758..ac98946cf 100644
--- a/vite.electron.config.mts
+++ b/vite.electron.config.mts
@@ -54,11 +54,7 @@ const mockElectronAPI: Plugin = {
           getElectronVersion: () => Promise.resolve('1.0.0'),
           getComfyUIVersion: () => '9.9.9',
           getPlatform: () => 'win32',
-          changeTheme: () => {},
-          Config: {
-            setWindowStyle: () => {},
-            getWindowStyle: () => Promise.resolve('default')
-          }
+          changeTheme: () => {}
         };`
       }
     ]

From 738de3baaa4c17dc3e2d9f15694321e95eeea0e3 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sat, 11 Jan 2025 16:43:54 +1100
Subject: [PATCH 02/19] Add missing electron mock API

Co-Authored-By: Chenlei Hu <hcl@comfy.org>
---
 vite.electron.config.mts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/vite.electron.config.mts b/vite.electron.config.mts
index ac98946cf..821919758 100644
--- a/vite.electron.config.mts
+++ b/vite.electron.config.mts
@@ -54,7 +54,11 @@ const mockElectronAPI: Plugin = {
           getElectronVersion: () => Promise.resolve('1.0.0'),
           getComfyUIVersion: () => '9.9.9',
           getPlatform: () => 'win32',
-          changeTheme: () => {}
+          changeTheme: () => {},
+          Config: {
+            setWindowStyle: () => {},
+            getWindowStyle: () => Promise.resolve('default')
+          }
         };`
       }
     ]

From 582ca967c65169e662a43c312027c73d21820803 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sat, 11 Jan 2025 16:51:28 +1100
Subject: [PATCH 03/19] Revert "[Desktop] Allow dragging window on empty
 titlebar (#2222)"

This reverts commit 30cd46ce1f13a6549167ec352404405f690ae7df.
---
 src/components/topbar/TopMenubar.vue   | 2 +-
 src/components/topbar/WorkflowTabs.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/topbar/TopMenubar.vue b/src/components/topbar/TopMenubar.vue
index 5d5ef2eae..4883fd3e5 100644
--- a/src/components/topbar/TopMenubar.vue
+++ b/src/components/topbar/TopMenubar.vue
@@ -9,7 +9,7 @@
       <h1 class="comfyui-logo mx-2 app-drag">ComfyUI</h1>
       <CommandMenubar />
       <Divider layout="vertical" class="mx-2" />
-      <div class="flex-grow min-w-0 app-drag h-full">
+      <div class="flex-grow min-w-0">
         <WorkflowTabs v-if="workflowTabsPosition === 'Topbar'" />
       </div>
       <div class="comfyui-menu-right" ref="menuRight"></div>
diff --git a/src/components/topbar/WorkflowTabs.vue b/src/components/topbar/WorkflowTabs.vue
index abbc5061b..1035fd3dd 100644
--- a/src/components/topbar/WorkflowTabs.vue
+++ b/src/components/topbar/WorkflowTabs.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="workflow-tabs-container flex flex-row max-w-full">
+  <div class="workflow-tabs-container flex flex-row w-full">
     <ScrollPanel
-      class="overflow-hidden no-drag"
+      class="overflow-hidden"
       :pt:content="{
         class: 'p-0 w-full',
         onwheel: handleWheel
@@ -28,7 +28,7 @@
     </ScrollPanel>
     <Button
       v-tooltip="{ value: $t('sideToolbar.newBlankWorkflow'), showDelay: 300 }"
-      class="new-blank-workflow-button flex-shrink-0 no-drag"
+      class="new-blank-workflow-button flex-shrink-0"
       icon="pi pi-plus"
       text
       severity="secondary"

From 45596058f16c8717592934cd8e589a26ea405ba1 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sat, 11 Jan 2025 16:51:55 +1100
Subject: [PATCH 04/19] Revert "[Desktop] Native window in graph view (#2216)"

This reverts commit 8f5aa1ff08dd8f691033fd9dd9874a98cd70c471.
---
 src/assets/css/style.css             |   6 -
 src/components/MenuHamburger.vue     |  32 +--
 src/components/topbar/TopMenubar.vue |  26 +-
 src/scripts/ui.ts                    | 400 +++++++++++++--------------
 4 files changed, 216 insertions(+), 248 deletions(-)

diff --git a/src/assets/css/style.css b/src/assets/css/style.css
index 24ad5013c..e5947bc5d 100644
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -765,7 +765,6 @@ audio.comfy-audio.empty-audio-widget {
   padding: var(--comfy-tree-explorer-item-padding) !important;
 }
 
-/* [Desktop] Electron window specific styles */
 .app-drag {
   app-region: drag;
 }
@@ -773,8 +772,3 @@ audio.comfy-audio.empty-audio-widget {
 .no-drag {
   app-region: no-drag;
 }
-
-.window-actions-spacer {
-  width: calc(100vw - env(titlebar-area-width, 100vw));
-}
-/* End of [Desktop] Electron window specific styles */
diff --git a/src/components/MenuHamburger.vue b/src/components/MenuHamburger.vue
index bd19f81fc..77036864d 100644
--- a/src/components/MenuHamburger.vue
+++ b/src/components/MenuHamburger.vue
@@ -1,22 +1,18 @@
 <template>
-  <div
+  <Button
     v-show="workspaceState.focusMode"
-    class="comfy-menu-hamburger no-drag"
+    class="comfy-menu-hamburger"
     :style="positionCSS"
-  >
-    <Button
-      icon="pi pi-bars"
-      severity="secondary"
-      text
-      size="large"
-      v-tooltip="{ value: $t('menu.showMenu'), showDelay: 300 }"
-      :aria-label="$t('menu.showMenu')"
-      aria-live="assertive"
-      @click="exitFocusMode"
-      @contextmenu="showNativeMenu"
-    />
-    <div v-show="menuSetting !== 'Bottom'" class="window-actions-spacer" />
-  </div>
+    icon="pi pi-bars"
+    severity="secondary"
+    text
+    size="large"
+    v-tooltip="{ value: $t('menu.showMenu'), showDelay: 300 }"
+    :aria-label="$t('menu.showMenu')"
+    aria-live="assertive"
+    @click="exitFocusMode"
+    @contextmenu="showNativeMenu"
+  />
 </template>
 
 <script setup lang="ts">
@@ -57,6 +53,8 @@ const positionCSS = computed<CSSProperties>(() =>
 
 <style scoped>
 .comfy-menu-hamburger {
-  @apply pointer-events-auto fixed z-[9999] flex flex-row;
+  pointer-events: auto;
+  position: fixed;
+  z-index: 9999;
 }
 </style>
diff --git a/src/components/topbar/TopMenubar.vue b/src/components/topbar/TopMenubar.vue
index 4883fd3e5..8c703d38e 100644
--- a/src/components/topbar/TopMenubar.vue
+++ b/src/components/topbar/TopMenubar.vue
@@ -3,10 +3,10 @@
     <div
       ref="topMenuRef"
       class="comfyui-menu flex items-center"
-      v-show="showTopMenu"
+      v-show="betaMenuEnabled && !workspaceState.focusMode"
       :class="{ dropzone: isDropZone, 'dropzone-active': isDroppable }"
     >
-      <h1 class="comfyui-logo mx-2 app-drag">ComfyUI</h1>
+      <h1 class="comfyui-logo mx-2">ComfyUI</h1>
       <CommandMenubar />
       <Divider layout="vertical" class="mx-2" />
       <div class="flex-grow min-w-0">
@@ -25,18 +25,8 @@
         @click="workspaceState.focusMode = true"
         @contextmenu="showNativeMenu"
       />
-      <div
-        v-show="menuSetting !== 'Bottom'"
-        class="window-actions-spacer flex-shrink-0"
-      />
     </div>
   </teleport>
-
-  <!-- Virtual top menu for native window (drag handle) -->
-  <div
-    v-show="isNativeWindow && !showTopMenu"
-    class="fixed top-0 left-0 app-drag w-full h-[var(--comfy-topbar-height)]"
-  />
 </template>
 
 <script setup lang="ts">
@@ -59,20 +49,14 @@ const settingStore = useSettingStore()
 const workflowTabsPosition = computed(() =>
   settingStore.get('Comfy.Workflow.WorkflowTabsPosition')
 )
-const menuSetting = computed(() => settingStore.get('Comfy.UseNewMenu'))
-const betaMenuEnabled = computed(() => menuSetting.value !== 'Disabled')
+const betaMenuEnabled = computed(
+  () => settingStore.get('Comfy.UseNewMenu') !== 'Disabled'
+)
 const teleportTarget = computed(() =>
   settingStore.get('Comfy.UseNewMenu') === 'Top'
     ? '.comfyui-body-top'
     : '.comfyui-body-bottom'
 )
-const isNativeWindow = computed(
-  () =>
-    isElectron() && settingStore.get('Comfy-Desktop.WindowStyle') === 'custom'
-)
-const showTopMenu = computed(
-  () => betaMenuEnabled.value && !workspaceState.focusMode
-)
 
 const menuRight = ref<HTMLDivElement | null>(null)
 // Menu-right holds legacy topbar elements attached by custom scripts
diff --git a/src/scripts/ui.ts b/src/scripts/ui.ts
index 9b05eedd7..2959fe289 100644
--- a/src/scripts/ui.ts
+++ b/src/scripts/ui.ts
@@ -411,231 +411,223 @@ export class ComfyUI {
       }
     })
 
-    this.menuContainer = $el(
-      'div.comfy-menu.no-drag',
-      { parent: containerElement },
-      [
-        $el(
-          'div.drag-handle.comfy-menu-header',
-          {
-            style: {
-              overflow: 'hidden',
-              position: 'relative',
-              width: '100%',
-              cursor: 'default'
+    this.menuContainer = $el('div.comfy-menu', { parent: containerElement }, [
+      $el(
+        'div.drag-handle.comfy-menu-header',
+        {
+          style: {
+            overflow: 'hidden',
+            position: 'relative',
+            width: '100%',
+            cursor: 'default'
+          }
+        },
+        [
+          $el('span.drag-handle'),
+          $el('span.comfy-menu-queue-size', { $: (q) => (this.queueSize = q) }),
+          $el('div.comfy-menu-actions', [
+            $el('button.comfy-settings-btn', {
+              textContent: '⚙️',
+              onclick: () => {
+                useDialogService().showSettingsDialog()
+              }
+            }),
+            $el('button.comfy-close-menu-btn', {
+              textContent: '\u00d7',
+              onclick: () => {
+                useWorkspaceStore().focusMode = true
+              }
+            })
+          ])
+        ]
+      ),
+      $el('button.comfy-queue-btn', {
+        id: 'queue-button',
+        textContent: 'Queue Prompt',
+        onclick: () => app.queuePrompt(0, this.batchCount)
+      }),
+      $el('div', {}, [
+        $el('label', { innerHTML: 'Extra options' }, [
+          $el('input', {
+            type: 'checkbox',
+            onchange: (i) => {
+              document.getElementById('extraOptions').style.display = i
+                .srcElement.checked
+                ? 'block'
+                : 'none'
+              this.batchCount = i.srcElement.checked
+                ? Number.parseInt(
+                    (
+                      document.getElementById(
+                        'batchCountInputRange'
+                      ) as HTMLInputElement
+                    ).value
+                  )
+                : 1
+              ;(
+                document.getElementById('autoQueueCheckbox') as HTMLInputElement
+              ).checked = false
+              this.autoQueueEnabled = false
             }
-          },
-          [
-            $el('span.drag-handle'),
-            $el('span.comfy-menu-queue-size', {
-              $: (q) => (this.queueSize = q)
+          })
+        ])
+      ]),
+      $el(
+        'div',
+        { id: 'extraOptions', style: { width: '100%', display: 'none' } },
+        [
+          $el('div', [
+            $el('label', { innerHTML: 'Batch count' }),
+            $el('input', {
+              id: 'batchCountInputNumber',
+              type: 'number',
+              value: this.batchCount,
+              min: '1',
+              style: { width: '35%', marginLeft: '0.4em' },
+              oninput: (i) => {
+                this.batchCount = i.target.value
+                /* Even though an <input> element with a type of range logically represents a number (since
+              it's used for numeric input), the value it holds is still treated as a string in HTML and
+              JavaScript. This behavior is consistent across all <input> elements regardless of their type
+              (like text, number, or range), where the .value property is always a string. */
+                ;(
+                  document.getElementById(
+                    'batchCountInputRange'
+                  ) as HTMLInputElement
+                ).value = this.batchCount.toString()
+              }
             }),
-            $el('div.comfy-menu-actions', [
-              $el('button.comfy-settings-btn', {
-                textContent: '⚙️',
-                onclick: () => {
-                  useDialogService().showSettingsDialog()
-                }
-              }),
-              $el('button.comfy-close-menu-btn', {
-                textContent: '\u00d7',
-                onclick: () => {
-                  useWorkspaceStore().focusMode = true
-                }
-              })
-            ])
-          ]
-        ),
-        $el('button.comfy-queue-btn', {
-          id: 'queue-button',
-          textContent: 'Queue Prompt',
-          onclick: () => app.queuePrompt(0, this.batchCount)
-        }),
-        $el('div', {}, [
-          $el('label', { innerHTML: 'Extra options' }, [
             $el('input', {
-              type: 'checkbox',
-              onchange: (i) => {
-                document.getElementById('extraOptions').style.display = i
-                  .srcElement.checked
-                  ? 'block'
-                  : 'none'
-                this.batchCount = i.srcElement.checked
-                  ? Number.parseInt(
-                      (
-                        document.getElementById(
-                          'batchCountInputRange'
-                        ) as HTMLInputElement
-                      ).value
-                    )
-                  : 1
+              id: 'batchCountInputRange',
+              type: 'range',
+              min: '1',
+              max: '100',
+              value: this.batchCount,
+              oninput: (i) => {
+                this.batchCount = i.srcElement.value
+                // Note
                 ;(
                   document.getElementById(
-                    'autoQueueCheckbox'
+                    'batchCountInputNumber'
                   ) as HTMLInputElement
-                ).checked = false
-                this.autoQueueEnabled = false
+                ).value = i.srcElement.value
               }
             })
+          ]),
+          $el('div', [
+            $el('label', {
+              for: 'autoQueueCheckbox',
+              innerHTML: 'Auto Queue'
+            }),
+            $el('input', {
+              id: 'autoQueueCheckbox',
+              type: 'checkbox',
+              checked: false,
+              title: 'Automatically queue prompt when the queue size hits 0',
+              onchange: (e) => {
+                this.autoQueueEnabled = e.target.checked
+                autoQueueModeEl.style.display = this.autoQueueEnabled
+                  ? ''
+                  : 'none'
+              }
+            }),
+            autoQueueModeEl
           ])
-        ]),
-        $el(
-          'div',
-          { id: 'extraOptions', style: { width: '100%', display: 'none' } },
-          [
-            $el('div', [
-              $el('label', { innerHTML: 'Batch count' }),
-              $el('input', {
-                id: 'batchCountInputNumber',
-                type: 'number',
-                value: this.batchCount,
-                min: '1',
-                style: { width: '35%', marginLeft: '0.4em' },
-                oninput: (i) => {
-                  this.batchCount = i.target.value
-                  /* Even though an <input> element with a type of range logically represents a number (since
-              it's used for numeric input), the value it holds is still treated as a string in HTML and
-              JavaScript. This behavior is consistent across all <input> elements regardless of their type
-              (like text, number, or range), where the .value property is always a string. */
-                  ;(
-                    document.getElementById(
-                      'batchCountInputRange'
-                    ) as HTMLInputElement
-                  ).value = this.batchCount.toString()
-                }
-              }),
-              $el('input', {
-                id: 'batchCountInputRange',
-                type: 'range',
-                min: '1',
-                max: '100',
-                value: this.batchCount,
-                oninput: (i) => {
-                  this.batchCount = i.srcElement.value
-                  // Note
-                  ;(
-                    document.getElementById(
-                      'batchCountInputNumber'
-                    ) as HTMLInputElement
-                  ).value = i.srcElement.value
-                }
-              })
-            ]),
-            $el('div', [
-              $el('label', {
-                for: 'autoQueueCheckbox',
-                innerHTML: 'Auto Queue'
-              }),
-              $el('input', {
-                id: 'autoQueueCheckbox',
-                type: 'checkbox',
-                checked: false,
-                title: 'Automatically queue prompt when the queue size hits 0',
-                onchange: (e) => {
-                  this.autoQueueEnabled = e.target.checked
-                  autoQueueModeEl.style.display = this.autoQueueEnabled
-                    ? ''
-                    : 'none'
-                }
-              }),
-              autoQueueModeEl
-            ])
-          ]
-        ),
-        $el('div.comfy-menu-btns', [
-          $el('button', {
-            id: 'queue-front-button',
-            textContent: 'Queue Front',
-            onclick: () => app.queuePrompt(-1, this.batchCount)
-          }),
-          $el('button', {
-            $: (b) => (this.queue.button = b as HTMLButtonElement),
-            id: 'comfy-view-queue-button',
-            textContent: 'View Queue',
-            onclick: () => {
-              this.history.hide()
-              this.queue.toggle()
-            }
-          }),
-          $el('button', {
-            $: (b) => (this.history.button = b as HTMLButtonElement),
-            id: 'comfy-view-history-button',
-            textContent: 'View History',
-            onclick: () => {
-              this.queue.hide()
-              this.history.toggle()
-            }
-          })
-        ]),
-        this.queue.element,
-        this.history.element,
+        ]
+      ),
+      $el('div.comfy-menu-btns', [
         $el('button', {
-          id: 'comfy-save-button',
-          textContent: 'Save',
-          onclick: () => {
-            useCommandStore().execute('Comfy.ExportWorkflow')
-          }
+          id: 'queue-front-button',
+          textContent: 'Queue Front',
+          onclick: () => app.queuePrompt(-1, this.batchCount)
         }),
         $el('button', {
-          id: 'comfy-dev-save-api-button',
-          textContent: 'Save (API Format)',
-          style: { width: '100%', display: 'none' },
+          $: (b) => (this.queue.button = b as HTMLButtonElement),
+          id: 'comfy-view-queue-button',
+          textContent: 'View Queue',
           onclick: () => {
-            useCommandStore().execute('Comfy.ExportWorkflowAPI')
+            this.history.hide()
+            this.queue.toggle()
           }
         }),
         $el('button', {
-          id: 'comfy-load-button',
-          textContent: 'Load',
-          onclick: () => fileInput.click()
-        }),
-        $el('button', {
-          id: 'comfy-refresh-button',
-          textContent: 'Refresh',
-          onclick: () => app.refreshComboInNodes()
-        }),
-        $el('button', {
-          id: 'comfy-clipspace-button',
-          textContent: 'Clipspace',
-          onclick: () => app.openClipspace()
-        }),
-        $el('button', {
-          id: 'comfy-clear-button',
-          textContent: 'Clear',
+          $: (b) => (this.history.button = b as HTMLButtonElement),
+          id: 'comfy-view-history-button',
+          textContent: 'View History',
           onclick: () => {
-            if (
-              !useSettingStore().get('Comfy.ConfirmClear') ||
-              confirm('Clear workflow?')
-            ) {
-              app.clean()
-              app.graph.clear()
-              app.resetView()
-              api.dispatchCustomEvent('graphCleared')
-            }
+            this.queue.hide()
+            this.history.toggle()
           }
-        }),
-        $el('button', {
-          id: 'comfy-load-default-button',
-          textContent: 'Load Default',
-          onclick: async () => {
-            if (
-              !useSettingStore().get('Comfy.ConfirmClear') ||
-              confirm('Load default workflow?')
-            ) {
-              app.resetView()
-              await app.loadGraphData()
-            }
+        })
+      ]),
+      this.queue.element,
+      this.history.element,
+      $el('button', {
+        id: 'comfy-save-button',
+        textContent: 'Save',
+        onclick: () => {
+          useCommandStore().execute('Comfy.ExportWorkflow')
+        }
+      }),
+      $el('button', {
+        id: 'comfy-dev-save-api-button',
+        textContent: 'Save (API Format)',
+        style: { width: '100%', display: 'none' },
+        onclick: () => {
+          useCommandStore().execute('Comfy.ExportWorkflowAPI')
+        }
+      }),
+      $el('button', {
+        id: 'comfy-load-button',
+        textContent: 'Load',
+        onclick: () => fileInput.click()
+      }),
+      $el('button', {
+        id: 'comfy-refresh-button',
+        textContent: 'Refresh',
+        onclick: () => app.refreshComboInNodes()
+      }),
+      $el('button', {
+        id: 'comfy-clipspace-button',
+        textContent: 'Clipspace',
+        onclick: () => app.openClipspace()
+      }),
+      $el('button', {
+        id: 'comfy-clear-button',
+        textContent: 'Clear',
+        onclick: () => {
+          if (
+            !useSettingStore().get('Comfy.ConfirmClear') ||
+            confirm('Clear workflow?')
+          ) {
+            app.clean()
+            app.graph.clear()
+            app.resetView()
+            api.dispatchCustomEvent('graphCleared')
           }
-        }),
-        $el('button', {
-          id: 'comfy-reset-view-button',
-          textContent: 'Reset View',
-          onclick: async () => {
+        }
+      }),
+      $el('button', {
+        id: 'comfy-load-default-button',
+        textContent: 'Load Default',
+        onclick: async () => {
+          if (
+            !useSettingStore().get('Comfy.ConfirmClear') ||
+            confirm('Load default workflow?')
+          ) {
             app.resetView()
+            await app.loadGraphData()
           }
-        })
-      ]
-    ) as HTMLDivElement
+        }
+      }),
+      $el('button', {
+        id: 'comfy-reset-view-button',
+        textContent: 'Reset View',
+        onclick: async () => {
+          app.resetView()
+        }
+      })
+    ]) as HTMLDivElement
     // Hide by default on construction so it does not interfere with other views.
     this.menuContainer.style.display = 'none'
 

From 104c0a5ba40374be354b26a3178aa1baf8d3a90c Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sat, 11 Jan 2025 16:57:04 +1100
Subject: [PATCH 05/19] Revert "[Desktop] Native window virtual menu bar
 (#2215)"

This reverts commit e076783b89adf5ce079dd84a62a4a6d33106a7e2.
---
 package-lock.json                        |  8 +++----
 package.json                             |  2 +-
 src/assets/css/style.css                 |  8 -------
 src/views/templates/BaseViewTemplate.vue | 30 ++++--------------------
 4 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b21c8c7bb..ba0d308fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "license": "GPL-3.0-only",
       "dependencies": {
         "@atlaskit/pragmatic-drag-and-drop": "^1.3.1",
-        "@comfyorg/comfyui-electron-types": "^0.4.7",
+        "@comfyorg/comfyui-electron-types": "^0.4.6",
         "@comfyorg/litegraph": "^0.8.60",
         "@primevue/themes": "^4.0.5",
         "@tiptap/core": "^2.10.4",
@@ -1935,9 +1935,9 @@
       "dev": true
     },
     "node_modules/@comfyorg/comfyui-electron-types": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/@comfyorg/comfyui-electron-types/-/comfyui-electron-types-0.4.7.tgz",
-      "integrity": "sha512-APC3C4VZOo9W6h0xiAGxnsU9iNp3T8rN9w/5KmOCI0GUoKtKg5U2OaicTmnMwcDSQe5Jxflmej53GyJ1nH9oRw==",
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/@comfyorg/comfyui-electron-types/-/comfyui-electron-types-0.4.6.tgz",
+      "integrity": "sha512-LY6AI7kMucMHU7UOAV9gGUPBUHrXXo1vxoabxupCL7xF2e8c14yHnJ4ngQogQrbwnLLax1mZfXNj/O9SyNtc9Q==",
       "license": "GPL-3.0-only"
     },
     "node_modules/@comfyorg/litegraph": {
diff --git a/package.json b/package.json
index 8324bfb5b..14cde2224 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
   },
   "dependencies": {
     "@atlaskit/pragmatic-drag-and-drop": "^1.3.1",
-    "@comfyorg/comfyui-electron-types": "^0.4.7",
+    "@comfyorg/comfyui-electron-types": "^0.4.6",
     "@comfyorg/litegraph": "^0.8.60",
     "@primevue/themes": "^4.0.5",
     "@tiptap/core": "^2.10.4",
diff --git a/src/assets/css/style.css b/src/assets/css/style.css
index e5947bc5d..4ace7bc15 100644
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -764,11 +764,3 @@ audio.comfy-audio.empty-audio-widget {
 .p-tree-node-content {
   padding: var(--comfy-tree-explorer-item-padding) !important;
 }
-
-.app-drag {
-  app-region: drag;
-}
-
-.no-drag {
-  app-region: no-drag;
-}
diff --git a/src/views/templates/BaseViewTemplate.vue b/src/views/templates/BaseViewTemplate.vue
index ae5a5d56e..e55a82ec8 100644
--- a/src/views/templates/BaseViewTemplate.vue
+++ b/src/views/templates/BaseViewTemplate.vue
@@ -1,28 +1,18 @@
 <template>
   <div
-    class="font-sans w-screen h-screen flex flex-col pointer-events-auto"
+    class="font-sans w-screen h-screen flex items-center justify-center pointer-events-auto overflow-auto"
     :class="[
       props.dark
         ? 'text-neutral-300 bg-neutral-900 dark-theme'
         : 'text-neutral-900 bg-neutral-300'
     ]"
   >
-    <!-- Virtual top menu for native window (drag handle) -->
-    <div
-      v-show="isNativeWindow"
-      ref="topMenuRef"
-      class="app-drag w-full h-[var(--comfy-topbar-height)]"
-    />
-    <div
-      class="flex-grow w-full flex items-center justify-center overflow-auto"
-    >
-      <slot></slot>
-    </div>
+    <slot></slot>
   </div>
 </template>
 
 <script setup lang="ts">
-import { nextTick, onMounted, ref } from 'vue'
+import { onMounted } from 'vue'
 
 import { electronAPI, isElectron } from '@/utils/envUtil'
 
@@ -45,19 +35,9 @@ const lightTheme = {
   symbolColor: '#171717'
 }
 
-const topMenuRef = ref<HTMLDivElement | null>(null)
-const isNativeWindow = ref(false)
-onMounted(async () => {
+onMounted(() => {
   if (isElectron()) {
-    const windowStyle = await electronAPI().Config.getWindowStyle()
-    isNativeWindow.value = windowStyle === 'custom'
-
-    await nextTick()
-
-    electronAPI().changeTheme({
-      ...(props.dark ? darkTheme : lightTheme),
-      height: topMenuRef.value.getBoundingClientRect().height
-    })
+    electronAPI().changeTheme(props.dark ? darkTheme : lightTheme)
   }
 })
 </script>

From eb01fa6574049cd9c015a4d8830744bbcbecc377 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sat, 11 Jan 2025 17:03:37 +1100
Subject: [PATCH 06/19] Partially Revert "[Desktop] Set window action buttons
 style (#2214)"

This reverts commit 04c23001fc5eefb29013112f3fff30b64a242d6c.
- No change to BaseViewTemplate
- No change to mock electronAPI
---
 src/components/topbar/TopMenubar.vue | 10 +---------
 src/views/GraphView.vue              |  8 --------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/components/topbar/TopMenubar.vue b/src/components/topbar/TopMenubar.vue
index 8c703d38e..c41fffe90 100644
--- a/src/components/topbar/TopMenubar.vue
+++ b/src/components/topbar/TopMenubar.vue
@@ -42,7 +42,7 @@ import WorkflowTabs from '@/components/topbar/WorkflowTabs.vue'
 import { app } from '@/scripts/app'
 import { useSettingStore } from '@/stores/settingStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
-import { electronAPI, isElectron, showNativeMenu } from '@/utils/envUtil'
+import { showNativeMenu } from '@/utils/envUtil'
 
 const workspaceState = useWorkspaceStore()
 const settingStore = useSettingStore()
@@ -77,14 +77,6 @@ eventBus.on((event: string, payload: any) => {
     isDroppable.value = payload.isOverlapping && payload.isDragging
   }
 })
-
-onMounted(() => {
-  if (isElectron()) {
-    electronAPI().changeTheme({
-      height: topMenuRef.value.getBoundingClientRect().height
-    })
-  }
-})
 </script>
 
 <style scoped>
diff --git a/src/views/GraphView.vue b/src/views/GraphView.vue
index 304977bc3..0fa3bb23a 100644
--- a/src/views/GraphView.vue
+++ b/src/views/GraphView.vue
@@ -46,7 +46,6 @@ import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
 import { StatusWsMessageStatus } from '@/types/apiTypes'
-import { electronAPI, isElectron } from '@/utils/envUtil'
 
 setupAutoQueueHandler()
 
@@ -65,13 +64,6 @@ watch(
     } else {
       document.body.classList.add(DARK_THEME_CLASS)
     }
-
-    if (isElectron()) {
-      electronAPI().changeTheme({
-        color: 'rgba(0, 0, 0, 0)',
-        symbolColor: newTheme.colors.comfy_base['input-text']
-      })
-    }
   },
   { immediate: true }
 )

From 504c661859e3583dceeb2b921243c5a4d0659db9 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sat, 11 Jan 2025 17:09:42 +1100
Subject: [PATCH 07/19] Fix native window control hover highlight

---
 src/views/templates/BaseViewTemplate.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/templates/BaseViewTemplate.vue b/src/views/templates/BaseViewTemplate.vue
index e55a82ec8..c8b904a61 100644
--- a/src/views/templates/BaseViewTemplate.vue
+++ b/src/views/templates/BaseViewTemplate.vue
@@ -26,12 +26,12 @@ const props = withDefaults(
 )
 
 const darkTheme = {
-  color: 'rgba(0, 0, 0, 0)',
+  color: 'rgba(23, 23, 23, 0)',
   symbolColor: '#d4d4d4'
 }
 
 const lightTheme = {
-  color: 'rgba(0, 0, 0, 0)',
+  color: 'rgba(212, 212, 212, 0)',
   symbolColor: '#171717'
 }
 

From 9d108b80b932a532b5263c906e3a03cd6f409240 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sat, 11 Jan 2025 18:02:55 +1100
Subject: [PATCH 08/19] Add hover colour to native window controls

---
 src/views/GraphView.vue | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/views/GraphView.vue b/src/views/GraphView.vue
index 0fa3bb23a..ab20d2529 100644
--- a/src/views/GraphView.vue
+++ b/src/views/GraphView.vue
@@ -46,6 +46,7 @@ import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
 import { StatusWsMessageStatus } from '@/types/apiTypes'
+import { electronAPI, isElectron } from '@/utils/envUtil'
 
 setupAutoQueueHandler()
 
@@ -64,6 +65,25 @@ watch(
     } else {
       document.body.classList.add(DARK_THEME_CLASS)
     }
+
+    // Native window control theme
+    if (isElectron()) {
+      const cssVars = newTheme.colors.comfy_base
+      // Allow OS to set matching hover colour
+      const color = setZeroAlpha(cssVars['comfy-menu-bg'])
+      const symbolColor = cssVars['input-text']
+      electronAPI().changeTheme({ color, symbolColor })
+    }
+
+    function setZeroAlpha(color: string) {
+      if (!color.startsWith('#')) return color
+
+      if (color.length === 4) {
+        const [_, r, g, b] = color
+        return `#${r}${r}${g}${g}${b}${b}00`
+      }
+      return `#${color.substring(1, 7)}00`
+    }
   },
   { immediate: true }
 )

From 002b7df7955af42c43bae171a539dabda54fa69d Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sat, 11 Jan 2025 18:06:55 +1100
Subject: [PATCH 09/19] Add per-view app-drag / no-drag

---
 src/assets/css/style.css              |  8 ++++++++
 src/views/DownloadGitView.vue         |  4 ++--
 src/views/InstallView.vue             |  4 ++--
 src/views/ManualConfigurationView.vue |  4 ++--
 src/views/NotSupportedView.vue        |  4 ++--
 src/views/ServerStartView.vue         | 10 +++++++---
 src/views/UserSelectView.vue          |  4 ++--
 src/views/WelcomeView.vue             |  4 ++--
 8 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/assets/css/style.css b/src/assets/css/style.css
index 4ace7bc15..e5947bc5d 100644
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -764,3 +764,11 @@ audio.comfy-audio.empty-audio-widget {
 .p-tree-node-content {
   padding: var(--comfy-tree-explorer-item-padding) !important;
 }
+
+.app-drag {
+  app-region: drag;
+}
+
+.no-drag {
+  app-region: no-drag;
+}
diff --git a/src/views/DownloadGitView.vue b/src/views/DownloadGitView.vue
index 347a12b29..88f9732f0 100644
--- a/src/views/DownloadGitView.vue
+++ b/src/views/DownloadGitView.vue
@@ -1,7 +1,7 @@
 <template>
-  <BaseViewTemplate>
+  <BaseViewTemplate class="app-drag">
     <div
-      class="max-w-screen-sm flex flex-col gap-8 p-8 bg-[url('/assets/images/Git-Logo-White.svg')] bg-no-repeat bg-right-top bg-origin-padding"
+      class="no-drag max-w-screen-sm flex flex-col gap-8 p-8 bg-[url('/assets/images/Git-Logo-White.svg')] bg-no-repeat bg-right-top bg-origin-padding"
     >
       <!-- Header -->
       <h1 class="mt-24 text-4xl font-bold text-red-500">
diff --git a/src/views/InstallView.vue b/src/views/InstallView.vue
index 8eb7c6b16..618b49588 100644
--- a/src/views/InstallView.vue
+++ b/src/views/InstallView.vue
@@ -1,10 +1,10 @@
 <template>
-  <BaseViewTemplate dark>
+  <BaseViewTemplate dark class="app-drag">
     <!-- h-full to make sure the stepper does not layout shift between steps
     as for each step the stepper height is different. Inherit the center element
     placement from BaseViewTemplate would cause layout shift. -->
     <Stepper
-      class="h-full p-8 2xl:p-16"
+      class="no-drag h-full p-8 2xl:p-16"
       value="0"
       @update:value="setHighestStep"
     >
diff --git a/src/views/ManualConfigurationView.vue b/src/views/ManualConfigurationView.vue
index fe9638c04..2eef614b5 100644
--- a/src/views/ManualConfigurationView.vue
+++ b/src/views/ManualConfigurationView.vue
@@ -1,8 +1,8 @@
 <template>
-  <BaseViewTemplate dark>
+  <BaseViewTemplate dark class="app-drag">
     <!-- Installation Path Section -->
     <div
-      class="comfy-installer grow flex flex-col gap-4 text-neutral-300 max-w-110"
+      class="no-drag comfy-installer grow flex flex-col gap-4 text-neutral-300 max-w-110"
     >
       <h2 class="text-2xl font-semibold text-neutral-100">
         {{ $t('install.manualConfiguration.title') }}
diff --git a/src/views/NotSupportedView.vue b/src/views/NotSupportedView.vue
index 9a07e397a..8eb84a4a7 100644
--- a/src/views/NotSupportedView.vue
+++ b/src/views/NotSupportedView.vue
@@ -1,6 +1,6 @@
 <template>
-  <BaseViewTemplate>
-    <div class="sad-container">
+  <BaseViewTemplate class="app-drag">
+    <div class="no-drag sad-container">
       <!-- Right side image -->
       <img
         class="sad-girl"
diff --git a/src/views/ServerStartView.vue b/src/views/ServerStartView.vue
index 069f9ab1a..5ef9569b3 100644
--- a/src/views/ServerStartView.vue
+++ b/src/views/ServerStartView.vue
@@ -1,5 +1,5 @@
 <template>
-  <BaseViewTemplate dark class="flex-col">
+  <BaseViewTemplate dark class="app-drag flex-col">
     <h2 class="text-2xl font-bold">
       {{ t(`serverStart.process.${status}`) }}
       <span v-if="status === ProgressStatus.ERROR">
@@ -8,7 +8,7 @@
     </h2>
     <div
       v-if="status === ProgressStatus.ERROR"
-      class="flex flex-col items-center gap-4"
+      class="no-drag flex flex-col items-center gap-4"
     >
       <div class="flex items-center my-4 gap-2">
         <Button
@@ -37,7 +37,11 @@
         @click="terminalVisible = true"
       />
     </div>
-    <BaseTerminal v-show="terminalVisible" @created="terminalCreated" />
+    <BaseTerminal
+      v-show="terminalVisible"
+      class="no-drag"
+      @created="terminalCreated"
+    />
   </BaseViewTemplate>
 </template>
 
diff --git a/src/views/UserSelectView.vue b/src/views/UserSelectView.vue
index e06a55298..15934918e 100644
--- a/src/views/UserSelectView.vue
+++ b/src/views/UserSelectView.vue
@@ -1,8 +1,8 @@
 <template>
-  <BaseViewTemplate dark>
+  <BaseViewTemplate dark class="app-drag">
     <main
       id="comfy-user-selection"
-      class="min-w-84 relative rounded-lg bg-[var(--comfy-menu-bg)] p-5 px-10 shadow-lg"
+      class="no-drag min-w-84 relative rounded-lg bg-[var(--comfy-menu-bg)] p-5 px-10 shadow-lg"
     >
       <h1 class="my-2.5 mb-7 font-normal">ComfyUI</h1>
       <div class="flex w-full flex-col items-center">
diff --git a/src/views/WelcomeView.vue b/src/views/WelcomeView.vue
index 07502221f..4c705e40f 100644
--- a/src/views/WelcomeView.vue
+++ b/src/views/WelcomeView.vue
@@ -1,6 +1,6 @@
 <template>
-  <BaseViewTemplate dark>
-    <div class="flex flex-col items-center justify-center gap-8 p-8">
+  <BaseViewTemplate dark class="app-drag">
+    <div class="no-drag flex flex-col items-center justify-center gap-8 p-8">
       <!-- Header -->
       <h1 class="animated-gradient-text text-glow select-none">
         {{ $t('welcome.title') }}

From 5f90dd9c3fcf0bc26abc4308c94324d450907c4d Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sat, 11 Jan 2025 18:08:54 +1100
Subject: [PATCH 10/19] Add top menu styles, logo, control offset

---
 public/assets/images/Comfy_Logo_x256.png | Bin 0 -> 22524 bytes
 src/App.vue                              |   3 ++
 src/components/MenuHamburger.vue         |   4 +-
 src/components/topbar/TopMenubar.vue     |  63 ++++++++++++++++++++++-
 4 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 public/assets/images/Comfy_Logo_x256.png

diff --git a/public/assets/images/Comfy_Logo_x256.png b/public/assets/images/Comfy_Logo_x256.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8cd75a38d0237c5a0521fbeb2cf8d77b34be1d7
GIT binary patch
literal 22524
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
Z^cU<2PcB5se<J_@002ovPDHLkV1jws-^Bm`

literal 0
HcmV?d00001

diff --git a/src/App.vue b/src/App.vue
index 2a8bae885..5225c5dae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -45,6 +45,9 @@ onMounted(() => {
 
   if (isElectron()) {
     document.addEventListener('contextmenu', showContextMenu)
+
+    // Enable CSS selectors
+    document.documentElement.dataset['platform'] = 'electron'
   }
 })
 </script>
diff --git a/src/components/MenuHamburger.vue b/src/components/MenuHamburger.vue
index 77036864d..efd93cdfc 100644
--- a/src/components/MenuHamburger.vue
+++ b/src/components/MenuHamburger.vue
@@ -46,8 +46,8 @@ const positionCSS = computed<CSSProperties>(() =>
   // 'Bottom' menuSetting shows the hamburger button in the bottom right corner
   // 'Disabled', 'Top' menuSetting shows the hamburger button in the top right corner
   menuSetting.value === 'Bottom'
-    ? { bottom: '0px', right: '0px' }
-    : { top: '0px', right: '0px' }
+    ? { bottom: '0', right: '0' }
+    : { top: '0', right: 'calc(100% - env(titlebar-area-width, 100%))' }
 )
 </script>
 
diff --git a/src/components/topbar/TopMenubar.vue b/src/components/topbar/TopMenubar.vue
index c41fffe90..e3a3753fe 100644
--- a/src/components/topbar/TopMenubar.vue
+++ b/src/components/topbar/TopMenubar.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script setup lang="ts">
-import { useEventBus } from '@vueuse/core'
+import { useEventBus, useResizeObserver } from '@vueuse/core'
 import Button from 'primevue/button'
 import Divider from 'primevue/divider'
 import { computed, onMounted, provide, ref } from 'vue'
@@ -42,7 +42,7 @@ import WorkflowTabs from '@/components/topbar/WorkflowTabs.vue'
 import { app } from '@/scripts/app'
 import { useSettingStore } from '@/stores/settingStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
-import { showNativeMenu } from '@/utils/envUtil'
+import { showNativeMenu, electronAPI, isElectron } from '@/utils/envUtil'
 
 const workspaceState = useWorkspaceStore()
 const settingStore = useSettingStore()
@@ -77,6 +77,21 @@ eventBus.on((event: string, payload: any) => {
     isDroppable.value = payload.isOverlapping && payload.isDragging
   }
 })
+
+/** Height of titlebar on desktop. */
+if (isElectron()) {
+  let desktopHeight = 0
+
+  useResizeObserver(topMenuRef, (entries) => {
+    if (settingStore.get('Comfy.UseNewMenu') !== 'Top') return
+
+    const { height } = entries[0].contentRect
+    if (desktopHeight === height) return
+
+    electronAPI().changeTheme({ height })
+    desktopHeight = height
+  })
+}
 </script>
 
 <style scoped>
@@ -112,3 +127,47 @@ eventBus.on((event: string, payload: any) => {
   cursor: default;
 }
 </style>
+
+<style>
+/* Custom window styling */
+:root[data-platform='electron'] {
+  .comfyui-logo {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    margin: 0.25rem 0.5rem;
+
+    &::before {
+      content: '';
+      width: 1.75rem;
+      height: 1.75rem;
+      background: url('/assets/images/Comfy_Logo_x256.png') no-repeat;
+      background-size: contain;
+    }
+  }
+
+  .comfyui-body-top {
+    .comfyui-menu {
+      app-region: drag;
+      padding-right: calc(100% - env(titlebar-area-width, 0));
+    }
+
+    .comfyui-menu::after {
+      content: '';
+      height: calc(100% - 0.75rem);
+      width: 2px;
+      background-color: var(--p-navigation-item-icon-color);
+      display: block;
+      margin-left: 1rem;
+      margin-right: 1rem;
+    }
+  }
+
+  button,
+  .p-menubar,
+  .comfyui-menu-right > *,
+  .actionbar {
+    app-region: no-drag;
+  }
+}
+</style>

From 6df7a45d6165c97403e96401754182f971ee9b75 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sat, 11 Jan 2025 23:20:44 +1100
Subject: [PATCH 11/19] Fix desktop API called when frontend settings loaded

---
 src/extensions/core/electronAdapter.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/extensions/core/electronAdapter.ts b/src/extensions/core/electronAdapter.ts
index 941982c44..678c4dc5a 100644
--- a/src/extensions/core/electronAdapter.ts
+++ b/src/extensions/core/electronAdapter.ts
@@ -39,14 +39,16 @@ import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil'
         id: 'Comfy-Desktop.WindowStyle',
         category: ['Comfy-Desktop', 'General', 'Window Style'],
         name: 'Window Style',
-        tooltip: 'Choose custom option to hide the system title bar',
+        tooltip: "Custom: Replace the system title bar with ComfyUI's Top menu",
         type: 'combo',
         defaultValue: 'default',
         options: ['default', 'custom'],
         onChange: (
           newValue: 'default' | 'custom',
-          oldValue: 'default' | 'custom'
+          oldValue?: 'default' | 'custom'
         ) => {
+          if (!oldValue) return
+
           electronAPI.Config.setWindowStyle(newValue)
 
           onChangeRestartApp(newValue, oldValue)

From 56e18aee3eb2e02f451031ac5eeed7b30622de64 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sat, 11 Jan 2025 23:23:52 +1100
Subject: [PATCH 12/19] Improve desktop settings UX - window style

- No longer requires app restart on window style change
---
 src/constants/coreSettings.ts          |  2 ++
 src/extensions/core/electronAdapter.ts | 26 +++++++++++++++++++++++---
 src/locales/en/settings.json           |  8 ++++----
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/constants/coreSettings.ts b/src/constants/coreSettings.ts
index e3765740e..7d9efdae1 100644
--- a/src/constants/coreSettings.ts
+++ b/src/constants/coreSettings.ts
@@ -386,6 +386,8 @@ export const CORE_SETTINGS: SettingParams[] = [
     category: ['Comfy', 'Menu', 'UseNewMenu'],
     defaultValue: 'Top',
     name: 'Use new menu',
+    tooltip:
+      '(Desktop, Windows only): When using custom window style, only Top is supported',
     type: 'combo',
     options: ['Disabled', 'Top', 'Bottom'],
     migrateDeprecatedValue: (value: string) => {
diff --git a/src/extensions/core/electronAdapter.ts b/src/extensions/core/electronAdapter.ts
index 678c4dc5a..1b18c07f8 100644
--- a/src/extensions/core/electronAdapter.ts
+++ b/src/extensions/core/electronAdapter.ts
@@ -1,8 +1,8 @@
 import { t } from '@/i18n'
 import { app } from '@/scripts/app'
 import { useDialogService } from '@/services/dialogService'
+import { useSettingStore } from '@/stores/settingStore'
 import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil'
-
 ;(async () => {
   if (!isElectron()) return
 
@@ -49,9 +49,12 @@ import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil'
         ) => {
           if (!oldValue) return
 
-          electronAPI.Config.setWindowStyle(newValue)
+          // Custom window mode requires the Top menu.
+          if (newValue === 'custom' && oldValue !== newValue) {
+            useSettingStore().set('Comfy.UseNewMenu', 'Top')
+          }
 
-          onChangeRestartApp(newValue, oldValue)
+          electronAPI.Config.setWindowStyle(newValue)
         }
       }
     ],
@@ -190,4 +193,21 @@ import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil'
       }
     ]
   })
+
+  // TODO: Replace monkey patch with API or replace UX.
+  // If the user changes frontend menu type, ensure custom window style is disabled.
+  const menuSetting = useSettingStore().settingsById['Comfy.UseNewMenu']
+  if (menuSetting) {
+    const { onChange } = menuSetting
+    menuSetting.onChange = (
+      newValue: 'Disabled' | 'Top' | 'Bottom',
+      oldValue?: 'Disabled' | 'Top' | 'Bottom'
+    ) => {
+      const style = useSettingStore().get('Comfy-Desktop.WindowStyle')
+      if (oldValue === 'Top' && newValue !== oldValue && style === 'custom') {
+        useSettingStore().set('Comfy-Desktop.WindowStyle', 'default')
+      }
+      return onChange?.(newValue, oldValue)
+    }
+  }
 })()
diff --git a/src/locales/en/settings.json b/src/locales/en/settings.json
index 471e86678..85cb646e1 100644
--- a/src/locales/en/settings.json
+++ b/src/locales/en/settings.json
@@ -7,10 +7,10 @@
   },
   "Comfy-Desktop_WindowStyle": {
     "name": "Window Style",
-    "tooltip": "Choose custom option to hide the system title bar",
+    "tooltip": "Custom: Replace the system title bar with ComfyUI's Top menu",
     "options": {
-      "default": "default",
-      "custom": "custom"
+      "default": "Default",
+      "custom": "Custom"
     }
   },
   "Comfy_ConfirmClear": {
@@ -312,4 +312,4 @@
   "pysssss_SnapToGrid": {
     "name": "Always snap to grid"
   }
-}
\ No newline at end of file
+}

From 9b2837250171d371f8414bc35ec8472a75fd1d45 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sat, 11 Jan 2025 23:48:57 +1100
Subject: [PATCH 13/19] Revert native controls separator - poor UX

Minor UX concern that can be looked at later.
---
 src/components/topbar/TopMenubar.vue | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/components/topbar/TopMenubar.vue b/src/components/topbar/TopMenubar.vue
index e3a3753fe..34e220784 100644
--- a/src/components/topbar/TopMenubar.vue
+++ b/src/components/topbar/TopMenubar.vue
@@ -151,16 +151,6 @@ if (isElectron()) {
       app-region: drag;
       padding-right: calc(100% - env(titlebar-area-width, 0));
     }
-
-    .comfyui-menu::after {
-      content: '';
-      height: calc(100% - 0.75rem);
-      width: 2px;
-      background-color: var(--p-navigation-item-icon-color);
-      display: block;
-      margin-left: 1rem;
-      margin-right: 1rem;
-    }
   }
 
   button,

From aa08f3d1cc700bbfd580e2f2591e93b250a0f4f4 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sun, 12 Jan 2025 00:28:01 +1100
Subject: [PATCH 14/19] Convert raw CSS to tailwind apply

---
 src/components/topbar/TopMenubar.vue | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/components/topbar/TopMenubar.vue b/src/components/topbar/TopMenubar.vue
index 34e220784..77d229228 100644
--- a/src/components/topbar/TopMenubar.vue
+++ b/src/components/topbar/TopMenubar.vue
@@ -129,20 +129,13 @@ if (isElectron()) {
 </style>
 
 <style>
-/* Custom window styling */
+/* Desktop: Custom window styling */
 :root[data-platform='electron'] {
   .comfyui-logo {
-    display: flex;
-    align-items: center;
-    gap: 0.5rem;
-    margin: 0.25rem 0.5rem;
+    @apply flex items-center gap-2 my-1 mx-1.5;
 
     &::before {
-      content: '';
-      width: 1.75rem;
-      height: 1.75rem;
-      background: url('/assets/images/Comfy_Logo_x256.png') no-repeat;
-      background-size: contain;
+      @apply w-7 h-7 bg-[url('/assets/images/Comfy_Logo_x256.png')] bg-no-repeat bg-contain content-[''];
     }
   }
 

From c5314e4dc032bbec97a5d9451ef5d1a4118f5215 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sun, 12 Jan 2025 01:17:49 +1100
Subject: [PATCH 15/19] nit - Remove redundant code

---
 src/extensions/core/electronAdapter.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/extensions/core/electronAdapter.ts b/src/extensions/core/electronAdapter.ts
index 1b18c07f8..ffdfd3c26 100644
--- a/src/extensions/core/electronAdapter.ts
+++ b/src/extensions/core/electronAdapter.ts
@@ -50,7 +50,7 @@ import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil'
           if (!oldValue) return
 
           // Custom window mode requires the Top menu.
-          if (newValue === 'custom' && oldValue !== newValue) {
+          if (newValue === 'custom') {
             useSettingStore().set('Comfy.UseNewMenu', 'Top')
           }
 
@@ -204,7 +204,7 @@ import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil'
       oldValue?: 'Disabled' | 'Top' | 'Bottom'
     ) => {
       const style = useSettingStore().get('Comfy-Desktop.WindowStyle')
-      if (oldValue === 'Top' && newValue !== oldValue && style === 'custom') {
+      if (oldValue === 'Top' && style === 'custom') {
         useSettingStore().set('Comfy-Desktop.WindowStyle', 'default')
       }
       return onChange?.(newValue, oldValue)

From a9e4f5eb22f0db2262eb6c5926c25ee189f8a9a4 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sun, 12 Jan 2025 01:19:25 +1100
Subject: [PATCH 16/19] nit

---
 src/components/topbar/TopMenubar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/topbar/TopMenubar.vue b/src/components/topbar/TopMenubar.vue
index 77d229228..6faba3694 100644
--- a/src/components/topbar/TopMenubar.vue
+++ b/src/components/topbar/TopMenubar.vue
@@ -128,7 +128,7 @@ if (isElectron()) {
 }
 </style>
 
-<style>
+<style lang="postcss">
 /* Desktop: Custom window styling */
 :root[data-platform='electron'] {
   .comfyui-logo {

From c41db49f7a0010acf16edb072839b4a114645906 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Sat, 11 Jan 2025 14:36:09 +0000
Subject: [PATCH 17/19] Update locales [skip ci]

---
 src/locales/en/settings.json | 7 ++++---
 src/locales/fr/settings.json | 3 ++-
 src/locales/ja/settings.json | 3 ++-
 src/locales/ko/settings.json | 3 ++-
 src/locales/ru/settings.json | 3 ++-
 src/locales/zh/settings.json | 3 ++-
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/locales/en/settings.json b/src/locales/en/settings.json
index 85cb646e1..029e1fbfe 100644
--- a/src/locales/en/settings.json
+++ b/src/locales/en/settings.json
@@ -9,8 +9,8 @@
     "name": "Window Style",
     "tooltip": "Custom: Replace the system title bar with ComfyUI's Top menu",
     "options": {
-      "default": "Default",
-      "custom": "Custom"
+      "default": "default",
+      "custom": "custom"
     }
   },
   "Comfy_ConfirmClear": {
@@ -261,6 +261,7 @@
   },
   "Comfy_UseNewMenu": {
     "name": "Use new menu",
+    "tooltip": "(Desktop, Windows only): When using custom window style, only Top is supported",
     "options": {
       "Disabled": "Disabled",
       "Top": "Top",
@@ -312,4 +313,4 @@
   "pysssss_SnapToGrid": {
     "name": "Always snap to grid"
   }
-}
+}
\ No newline at end of file
diff --git a/src/locales/fr/settings.json b/src/locales/fr/settings.json
index 70ee739d6..fff88d916 100644
--- a/src/locales/fr/settings.json
+++ b/src/locales/fr/settings.json
@@ -265,7 +265,8 @@
       "Bottom": "Bas",
       "Disabled": "Désactivé",
       "Top": "Haut"
-    }
+    },
+    "tooltip": "(Bureau, uniquement Windows): Lors de l'utilisation d'un style de fenêtre personnalisé, seul Top est pris en charge"
   },
   "Comfy_Validation_NodeDefs": {
     "name": "Valider les définitions de nœuds (lent)",
diff --git a/src/locales/ja/settings.json b/src/locales/ja/settings.json
index 13e19a374..4cdce27bb 100644
--- a/src/locales/ja/settings.json
+++ b/src/locales/ja/settings.json
@@ -265,7 +265,8 @@
       "Bottom": "下",
       "Disabled": "無効",
       "Top": "上"
-    }
+    },
+    "tooltip": "(デスクトップ、Windowsのみ): カスタムウィンドウスタイルを使用する場合、Topのみがサポートされます"
   },
   "Comfy_Validation_NodeDefs": {
     "name": "ノード定義を検証（遅い）",
diff --git a/src/locales/ko/settings.json b/src/locales/ko/settings.json
index be07e15ba..cf34b71f7 100644
--- a/src/locales/ko/settings.json
+++ b/src/locales/ko/settings.json
@@ -265,7 +265,8 @@
       "Bottom": "하단",
       "Disabled": "비활성화",
       "Top": "상단"
-    }
+    },
+    "tooltip": "(데스크톱, 윈도우 전용): 사용자 정의 창 스타일을 사용할 때는 Top만 지원됩니다"
   },
   "Comfy_Validation_NodeDefs": {
     "name": "노드 정의 유효성 검사 (느림)",
diff --git a/src/locales/ru/settings.json b/src/locales/ru/settings.json
index bec2bf2a6..667117a18 100644
--- a/src/locales/ru/settings.json
+++ b/src/locales/ru/settings.json
@@ -265,7 +265,8 @@
       "Bottom": "Внизу",
       "Disabled": "Отключено",
       "Top": "Вверху"
-    }
+    },
+    "tooltip": "(Рабочий стол, только для Windows): При использовании пользовательского стиля окна поддерживается только верхняя часть"
   },
   "Comfy_Validation_NodeDefs": {
     "name": "Проверка определений узлов (медленно)",
diff --git a/src/locales/zh/settings.json b/src/locales/zh/settings.json
index 983ff0250..f7b1df6de 100644
--- a/src/locales/zh/settings.json
+++ b/src/locales/zh/settings.json
@@ -265,7 +265,8 @@
       "Bottom": "底部",
       "Disabled": "禁用",
       "Top": "顶部"
-    }
+    },
+    "tooltip": "(仅限桌面，Windows): 使用自定义窗口样式时，只支持顶部"
   },
   "Comfy_Validation_NodeDefs": {
     "name": "校验节点定义（慢）",

From 546993ffe37049439bffc52d889d6277534033d4 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sun, 12 Jan 2025 02:09:11 +1100
Subject: [PATCH 18/19] Reapply "[Desktop] Native window virtual menu bar
 (#2215)"

This reverts commit 104c0a5ba40374be354b26a3178aa1baf8d3a90c.
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ba0d308fc..b21c8c7bb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "license": "GPL-3.0-only",
       "dependencies": {
         "@atlaskit/pragmatic-drag-and-drop": "^1.3.1",
-        "@comfyorg/comfyui-electron-types": "^0.4.6",
+        "@comfyorg/comfyui-electron-types": "^0.4.7",
         "@comfyorg/litegraph": "^0.8.60",
         "@primevue/themes": "^4.0.5",
         "@tiptap/core": "^2.10.4",
@@ -1935,9 +1935,9 @@
       "dev": true
     },
     "node_modules/@comfyorg/comfyui-electron-types": {
-      "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/@comfyorg/comfyui-electron-types/-/comfyui-electron-types-0.4.6.tgz",
-      "integrity": "sha512-LY6AI7kMucMHU7UOAV9gGUPBUHrXXo1vxoabxupCL7xF2e8c14yHnJ4ngQogQrbwnLLax1mZfXNj/O9SyNtc9Q==",
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/@comfyorg/comfyui-electron-types/-/comfyui-electron-types-0.4.7.tgz",
+      "integrity": "sha512-APC3C4VZOo9W6h0xiAGxnsU9iNp3T8rN9w/5KmOCI0GUoKtKg5U2OaicTmnMwcDSQe5Jxflmej53GyJ1nH9oRw==",
       "license": "GPL-3.0-only"
     },
     "node_modules/@comfyorg/litegraph": {
diff --git a/package.json b/package.json
index 14cde2224..8324bfb5b 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
   },
   "dependencies": {
     "@atlaskit/pragmatic-drag-and-drop": "^1.3.1",
-    "@comfyorg/comfyui-electron-types": "^0.4.6",
+    "@comfyorg/comfyui-electron-types": "^0.4.7",
     "@comfyorg/litegraph": "^0.8.60",
     "@primevue/themes": "^4.0.5",
     "@tiptap/core": "^2.10.4",

From 2e8e9e624b309fc83097bd95447951faf85df665 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sun, 12 Jan 2025 02:27:10 +1100
Subject: [PATCH 19/19] nit

---
 src/components/topbar/TopMenubar.vue   | 2 +-
 src/extensions/core/electronAdapter.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/topbar/TopMenubar.vue b/src/components/topbar/TopMenubar.vue
index 6faba3694..f9196e29d 100644
--- a/src/components/topbar/TopMenubar.vue
+++ b/src/components/topbar/TopMenubar.vue
@@ -42,7 +42,7 @@ import WorkflowTabs from '@/components/topbar/WorkflowTabs.vue'
 import { app } from '@/scripts/app'
 import { useSettingStore } from '@/stores/settingStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
-import { showNativeMenu, electronAPI, isElectron } from '@/utils/envUtil'
+import { electronAPI, isElectron, showNativeMenu } from '@/utils/envUtil'
 
 const workspaceState = useWorkspaceStore()
 const settingStore = useSettingStore()
diff --git a/src/extensions/core/electronAdapter.ts b/src/extensions/core/electronAdapter.ts
index ffdfd3c26..fefc0daf4 100644
--- a/src/extensions/core/electronAdapter.ts
+++ b/src/extensions/core/electronAdapter.ts
@@ -3,6 +3,7 @@ import { app } from '@/scripts/app'
 import { useDialogService } from '@/services/dialogService'
 import { useSettingStore } from '@/stores/settingStore'
 import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil'
+
 ;(async () => {
   if (!isElectron()) return