Merge branch 'main' into feat/custom-assets-server

A-kirami · Dec 3, 2024 · a94e0ee · a94e0ee
2 parents 69e3aa2 + 49749c4
commit a94e0ee
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
@@ -1,4 +1,4 @@
-use tauri::Manager;
+use tauri::{Manager, WebviewUrl, WebviewWindowBuilder};
 mod command;
 mod state;
 mod utils;
@@ -7,8 +7,26 @@ use std::sync::Mutex;
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     let mut builder = tauri::Builder::default().setup(|app| {
-        #[cfg(dev)]
-        app.get_webview_window("main",).unwrap().open_devtools();
+        let win_builder = WebviewWindowBuilder::new(app, "main", WebviewUrl::default(),)
+            .title("Matcha",)
+            .min_inner_size(620.0, 540.0,)
+            .inner_size(1080.0, 720.0,)
+            .center();
+
+        #[cfg(not(target_os = "macos"))]
+        let win_builder = win_builder.decorations(false,).transparent(true,);
+
+        #[cfg(target_os = "macos")]
+        let win_builder = win_builder
+            .decorations(true,)
+            .hidden_title(true,)
+            .title_bar_style(tauri::TitleBarStyle::Overlay,);
+
+        let window = win_builder.build().unwrap();
+
+        if tauri::is_dev() {
+            window.open_devtools();
+        }
 
         app.manage(Mutex::new(state::AppState::default(),),);
 

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -12,16 +12,6 @@
   "app": {
     "macOSPrivateApi": true,
     "windows": [
-      {
-        "title": "Matcha",
-        "height": 720,
-        "width": 1080,
-        "minHeight": 540,
-        "minWidth": 620,
-        "center": true,
-        "decorations": false,
-        "transparent": true
-      }
     ],
     "security": {
       "csp": null

diff --git a/src/components/AppSidebar.vue b/src/components/AppSidebar.vue
@@ -8,13 +8,12 @@ const isMacOs = $computed(() => unref(osType) === 'macos')
 
 <template>
   <aside
-    class="w-15 flex flex-col items-center gap-4 bg-background pb-5"
+    class="flex flex-col items-center gap-4 bg-background pb-5"
     :class="[
       focused ? 'bg-opacity-40 dark:bg-opacity-60' : 'bg-opacity-70 dark:bg-opacity-90',
-      isMacOs ? 'pt-2' : 'pt-7',
+      isMacOs ? 'pt-8 w-18' : 'pt-7 w-15',
     ]"
   >
-    <WindowControls v-if="isMacOs" />
     <AppLogo class="size-9" />
     <AppSidebarNavigation />
     <AppSidebarUserAvatar class="mt-auto" />