From f18740d5e4a419aa4cff80d549b0c7379c5751b4 Mon Sep 17 00:00:00 2001
From: pythongosssss <125205205+pythongosssss@users.noreply.github.com>
Date: Sun, 21 Jul 2024 10:52:58 +0100
Subject: [PATCH] Sync PR (#182)

#133
---
 src/assets/css/style.css         | 25 +++++++++++++++++--------
 src/scripts/ui/menu/workflows.ts | 18 ++++++++++++------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/assets/css/style.css b/src/assets/css/style.css
index 72ab5794c7..1251dafbf4 100644
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -37,7 +37,7 @@ body {
 	margin: 0;
 	overflow: hidden;
 	grid-template-columns: auto 1fr auto;
-	grid-template-rows: auto auto 1fr auto;
+	grid-template-rows: auto 1fr auto;
 	background-color: var(--bg-color);
 	color: var(--fg-color);
 	min-height: -webkit-fill-available;
@@ -48,32 +48,37 @@ body {
 }
 
 .comfyui-body-top {
-	order: 0;
+	order: -5;
 	grid-column: 1/-1;
 	z-index: 10;
+	display: flex;
+	flex-direction: column;
 }
 
 .comfyui-body-left {
-	order: 1;
+	order: -4;
 	z-index: 10;
+	display: flex;
 }
 
 #graph-canvas {
 	width: 100%;
 	height: 100%;
-	order: 2;
-	grid-column: 1/-1;
+	order: -3;
 }
 
 .comfyui-body-right {
-	order: 3;
+	order: -2;
 	z-index: 10;
+	display: flex;
 }
 
 .comfyui-body-bottom {
-	order: 4;
+	order: -1;
 	grid-column: 1/-1;
 	z-index: 10;
+	display: flex;
+	flex-direction: column;
 }
 
 .comfy-multiline-input {
@@ -407,8 +412,12 @@ dialog::backdrop {
 	background: rgba(0, 0, 0, 0.5);
 }
 
-.comfy-dialog.comfyui-dialog {
+.comfy-dialog.comfyui-dialog.comfy-modal {
 	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	transform: none;
 }
 
 .comfy-dialog.comfy-modal {
diff --git a/src/scripts/ui/menu/workflows.ts b/src/scripts/ui/menu/workflows.ts
index 11494a1e10..f0df9813cb 100644
--- a/src/scripts/ui/menu/workflows.ts
+++ b/src/scripts/ui/menu/workflows.ts
@@ -197,6 +197,13 @@ export class ComfyWorkflowsMenu {
           img: HTMLImageElement,
           workflow: ComfyWorkflow
         ) {
+          const openWorkflow = app.workflowManager.openWorkflows.find(
+            (w) => w.path === workflow.path
+          );
+          if (openWorkflow) {
+            workflow = openWorkflow;
+          }
+
           await workflow.load();
           let options = [];
           const nodes = app.graph.computeExecutionOrder(false);
@@ -232,12 +239,11 @@ export class ComfyWorkflowsMenu {
           options
         ) {
           const r = getExtraMenuOptions?.apply?.(this, arguments);
-          if (
-            app.ui.settings.getSettingValue<boolean>(
-              "Comfy.UseNewMenu",
-              false
-            ) === true
-          ) {
+          const setting = app.ui.settings.getSettingValue(
+            "Comfy.UseNewMenu",
+            false
+          );
+          if (setting && setting != "Disabled") {
             const t = this;
             let img;
             if (t.imageIndex != null) {