From bcc5e18082c83cad48108a00f7622eebe611409d Mon Sep 17 00:00:00 2001
From: reya <123083837+reyamir@users.noreply.github.com>
Date: Mon, 19 Aug 2024 10:48:29 +0700
Subject: [PATCH] fix: adjust window controls position

---
 src-tauri/src/commands/window.rs | 3 ++-
 src/app.css                      | 6 +++++-
 src/routes/$account.lazy.tsx     | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src-tauri/src/commands/window.rs b/src-tauri/src/commands/window.rs
index b4dde532..a61b364b 100644
--- a/src-tauri/src/commands/window.rs
+++ b/src-tauri/src/commands/window.rs
@@ -132,7 +132,7 @@ pub fn reload_column(label: String, app_handle: tauri::AppHandle) -> Result<(),
     }
 }
 
-#[tauri::command]
+#[tauri::command(async)]
 #[specta::specta]
 pub fn open_window(window: Window, app_handle: tauri::AppHandle) -> Result<(), String> {
     if let Some(window) = app_handle.get_window(&window.label) {
@@ -178,6 +178,7 @@ pub fn open_window(window: Window, app_handle: tauri::AppHandle) -> Result<(), S
         .minimizable(window.minimizable)
         .maximizable(window.maximizable)
         .transparent(true)
+        .decoration(false)
         .effects(WindowEffectsConfig {
             state: None,
             effects: vec![Effect::Mica],
diff --git a/src/app.css b/src/app.css
index be9821ef..7ab845ca 100644
--- a/src/app.css
+++ b/src/app.css
@@ -50,7 +50,11 @@ input::-ms-clear {
 }
 
 div[data-tauri-decorum-tb] {
-	@apply h-11;
+	@apply h-11 !important;
+}
+
+button.decorum-tb-btn {
+	@apply h-11 !important;
 }
 
 .spinner-leaf {
diff --git a/src/routes/$account.lazy.tsx b/src/routes/$account.lazy.tsx
index b39d0952..b58c12b1 100644
--- a/src/routes/$account.lazy.tsx
+++ b/src/routes/$account.lazy.tsx
@@ -37,7 +37,7 @@ function Screen() {
 				data-tauri-drag-region
 				className={cn(
 					"flex h-11 shrink-0 items-center justify-between",
-					platform === "macos" ? "pl-[72px] pr-3" : "pr-[128px] pl-3",
+					platform === "macos" ? "pl-[72px] pr-3" : "pr-[156px] pl-3",
 				)}
 			>
 				<div