From 0a7000328ac65f3547a205262058dfadce1239e9 Mon Sep 17 00:00:00 2001
From: Chenlei Hu <huchenlei@proton.me>
Date: Wed, 6 Nov 2024 20:56:32 -0500
Subject: [PATCH] Add menu button to toggle focus mode (#1446)

* Add focus mode toggle button

* handle menu position

* nit
---
 src/components/MenuHamburger.vue     | 15 ++++++++++++---
 src/components/graph/GraphCanvas.vue |  8 ++++----
 src/components/topbar/TopMenubar.vue | 14 ++++++++++----
 src/i18n.ts                          |  6 ++++++
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/components/MenuHamburger.vue b/src/components/MenuHamburger.vue
index 4a0b7bdf7..ab2a3300c 100644
--- a/src/components/MenuHamburger.vue
+++ b/src/components/MenuHamburger.vue
@@ -2,10 +2,12 @@
   <Button
     v-show="workspaceState.focusMode"
     class="comfy-menu-hamburger"
+    :style="positionCSS"
     icon="pi pi-bars"
     severity="secondary"
     text
     size="large"
+    v-tooltip="{ value: $t('menu.showMenu'), showDelay: 300 }"
     @click="exitFocusMode"
   />
 </template>
@@ -13,7 +15,7 @@
 <script setup lang="ts">
 import Button from 'primevue/button'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
-import { watchEffect } from 'vue'
+import { computed, CSSProperties, watchEffect } from 'vue'
 import { app } from '@/scripts/app'
 import { useSettingStore } from '@/stores/settingStore'
 
@@ -33,14 +35,21 @@ watchEffect(() => {
     app.ui.menuContainer.style.display = 'block'
   }
 })
+
+const menuSetting = computed(() => settingStore.get('Comfy.UseNewMenu'))
+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' }
+)
 </script>
 
 <style scoped>
 .comfy-menu-hamburger {
   pointer-events: auto;
   position: fixed;
-  top: 0px;
-  right: 0px;
   z-index: 9999;
 }
 </style>
diff --git a/src/components/graph/GraphCanvas.vue b/src/components/graph/GraphCanvas.vue
index 5465e4410..9b0208410 100644
--- a/src/components/graph/GraphCanvas.vue
+++ b/src/components/graph/GraphCanvas.vue
@@ -1,6 +1,8 @@
 <template>
   <teleport to=".graph-canvas-container">
-    <LiteGraphCanvasSplitterOverlay v-if="betaMenuEnabled">
+    <LiteGraphCanvasSplitterOverlay
+      v-if="betaMenuEnabled && !workspaceStore.focusMode"
+    >
       <template #side-bar-panel>
         <SideToolbar />
       </template>
@@ -65,9 +67,7 @@ const workspaceStore = useWorkspaceStore()
 const canvasStore = useCanvasStore()
 const modelToNodeStore = useModelToNodeStore()
 const betaMenuEnabled = computed(
-  () =>
-    settingStore.get('Comfy.UseNewMenu') !== 'Disabled' &&
-    !workspaceStore.focusMode
+  () => settingStore.get('Comfy.UseNewMenu') !== 'Disabled'
 )
 const canvasMenuEnabled = computed(() =>
   settingStore.get('Comfy.Graph.CanvasMenu')
diff --git a/src/components/topbar/TopMenubar.vue b/src/components/topbar/TopMenubar.vue
index 529cee15f..be3785cc3 100644
--- a/src/components/topbar/TopMenubar.vue
+++ b/src/components/topbar/TopMenubar.vue
@@ -3,7 +3,7 @@
     <div
       ref="topMenuRef"
       class="comfyui-menu flex items-center"
-      v-show="betaMenuEnabled"
+      v-show="betaMenuEnabled && !workspaceState.focusMode"
       :class="{ dropzone: isDropZone, 'dropzone-active': isDroppable }"
     >
       <h1 class="comfyui-logo mx-2">ComfyUI</h1>
@@ -15,11 +15,19 @@
       <div class="comfyui-menu-right" ref="menuRight"></div>
       <Actionbar />
       <BottomPanelToggleButton />
+      <Button
+        icon="pi pi-bars"
+        severity="secondary"
+        text
+        v-tooltip="{ value: $t('menu.hideMenu'), showDelay: 300 }"
+        @click="workspaceState.focusMode = true"
+      />
     </div>
   </teleport>
 </template>
 
 <script setup lang="ts">
+import Button from 'primevue/button'
 import Divider from 'primevue/divider'
 import WorkflowTabs from '@/components/topbar/WorkflowTabs.vue'
 import CommandMenubar from '@/components/topbar/CommandMenubar.vue'
@@ -37,9 +45,7 @@ const workflowTabsPosition = computed(() =>
   settingStore.get('Comfy.Workflow.WorkflowTabsPosition')
 )
 const betaMenuEnabled = computed(
-  () =>
-    settingStore.get('Comfy.UseNewMenu') !== 'Disabled' &&
-    !workspaceState.focusMode
+  () => settingStore.get('Comfy.UseNewMenu') !== 'Disabled'
 )
 const teleportTarget = computed(() =>
   settingStore.get('Comfy.UseNewMenu') === 'Top'
diff --git a/src/i18n.ts b/src/i18n.ts
index 1de2cb0df..14e6301c2 100644
--- a/src/i18n.ts
+++ b/src/i18n.ts
@@ -77,6 +77,8 @@ const messages = {
       }
     },
     menu: {
+      hideMenu: 'Hide Menu',
+      showMenu: 'Show Menu',
       batchCount: 'Batch Count',
       batchCountTooltip:
         'The number of times the workflow generation should be queued',
@@ -193,6 +195,8 @@ const messages = {
       }
     },
     menu: {
+      hideMenu: '隐藏菜单',
+      showMenu: '显示菜单',
       batchCount: '批次数量',
       batchCountTooltip: '工作流生成次数',
       autoQueue: '自动执行',
@@ -307,6 +311,8 @@ const messages = {
       }
     },
     menu: {
+      hideMenu: 'Скрыть меню',
+      showMenu: 'Показать меню',
       batchCount: 'Количество пакетов',
       batchCountTooltip:
         'Количество раз, когда генерация рабочего процесса должна быть помещена в очередь',