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] 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>