From 121283990bc5f33120d4b684bd6fbf062b01294c Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Sun, 24 Aug 2025 15:01:55 -0400
Subject: [PATCH] cleanup titlebar setup (#780)

---
 .../lifecycle/startup/setup_main_window.rs    | 40 +++++++------------
 crates/desktop/artcraft/tauri-mac.conf.json   |  9 -----
 crates/desktop/artcraft/tauri.conf.json       |  9 -----
 3 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/crates/desktop/artcraft/src/core/lifecycle/startup/setup_main_window.rs b/crates/desktop/artcraft/src/core/lifecycle/startup/setup_main_window.rs
index c2cd7239d3..310433f191 100644
--- a/crates/desktop/artcraft/src/core/lifecycle/startup/setup_main_window.rs
+++ b/crates/desktop/artcraft/src/core/lifecycle/startup/setup_main_window.rs
@@ -1,51 +1,39 @@
-use tauri::{AppHandle, TitleBarStyle, WebviewUrl, WebviewWindowBuilder};
-use tauri::window::Color;
+use crate::core::windows::main_window::constants::MAIN_WINDOW_NAME;
 use errors::AnyhowResult;
+use tauri::window::Color;
+use tauri::{AppHandle, TitleBarStyle, WebviewUrl, WebviewWindowBuilder};
 
 pub async fn setup_main_window(
   app: &AppHandle,
 ) -> AnyhowResult<()> {
 
   let win_builder =
-      WebviewWindowBuilder::new(app, "main", WebviewUrl::default())
-          .title("Artcraft")
-          //.decorations(false) // NB: This breaks Mac!
+      WebviewWindowBuilder::new(app, MAIN_WINDOW_NAME, WebviewUrl::default())
+          .title("ArtCraft")
           .resizable(true)
           .fullscreen(false)
           .background_color(Color(0, 0, 0, 0))
           .enable_clipboard_access()
-          .inner_size(800.0, 600.0);
+          .inner_size(2400.0, 1300.0);
 
-  // set transparent title bar only when building for macOS
   #[cfg(target_os = "macos")]
   let win_builder = win_builder
-      .decorations(true) // NB: Mac requires decorations. Tons of capabilities disappear without it.
+      .decorations(true) // NB: Mac requires decorations. Tons of capabilities disappear otherwise.
       .title_bar_style(TitleBarStyle::Overlay)
       .hidden_title(true)
       .accept_first_mouse(true) // https://github.com/tauri-apps/tauri/issues/11605#issuecomment-2460112096
       .focusable(true)
       .focused(true);
 
-  let window = win_builder.build()?;
+  #[cfg(not(target_os = "macos"))]
+  let win_builder = win_builder
+      .decorations(false); // NB: This breaks Mac!
 
-  /*// set background color only when building for macOS
-  #[cfg(target_os = "macos")]
-  {
-    use cocoa::appkit::{NSColor, NSWindow};
-    use cocoa::base::{id, nil};
+  #[cfg(target_os = "windows")]
+  let win_builder = win_builder
+      .drag_and_drop(false); // TODO: Is this necessary on Windows?
 
-    let ns_window = window.ns_window().unwrap() as id;
-    unsafe {
-      let bg_color = NSColor::colorWithRed_green_blue_alpha_(
-        nil,
-        50.0 / 255.0,
-        158.0 / 255.0,
-        163.5 / 255.0,
-        0.0,
-      );
-      ns_window.setBackgroundColor_(bg_color);
-    }
-  }*/
+  let _window = win_builder.build()?;
 
   Ok(())
 }
\ No newline at end of file
diff --git a/crates/desktop/artcraft/tauri-mac.conf.json b/crates/desktop/artcraft/tauri-mac.conf.json
index 140921cba9..6ae2af0aec 100644
--- a/crates/desktop/artcraft/tauri-mac.conf.json
+++ b/crates/desktop/artcraft/tauri-mac.conf.json
@@ -11,15 +11,6 @@
   },
   "app": {
     "windows": [
-      {
-        "title": "ArtCraft",
-        "width": 2400,
-        "height": 1300,
-        "resizable": true,
-        "fullscreen": false,
-        "decorations": true,
-        "dragDropEnabled": false
-      }
     ],
     "security": {
       "csp": {
diff --git a/crates/desktop/artcraft/tauri.conf.json b/crates/desktop/artcraft/tauri.conf.json
index 1ce7dd3ee6..6ae2af0aec 100644
--- a/crates/desktop/artcraft/tauri.conf.json
+++ b/crates/desktop/artcraft/tauri.conf.json
@@ -11,15 +11,6 @@
   },
   "app": {
     "windows": [
-      {
-        "title": "ArtCraft",
-        "width": 2400,
-        "height": 1300,
-        "resizable": true,
-        "fullscreen": false,
-        "decorations": false,
-        "dragDropEnabled": false
-      }
     ],
     "security": {
       "csp": {