updated

src-tauri/src/main.rs

@@ -3,20 +3,11 @@
   windows_subsystem = "windows"
 )]
 
-#[cfg(target_os = "macos")]
-#[macro_use]
-extern crate objc;
-
 // use rand::distributions::{Alphanumeric, DistString};
-use tauri::{Manager, WindowEvent};
+use tauri::{Manager};
 use tauri_plugin_autostart::MacosLauncher;
 use tauri_plugin_sql::{Migration, MigrationKind};
 
-#[cfg(target_os = "macos")]
-use window_ext::WindowExt;
-#[cfg(target_os = "macos")]
-mod window_ext;
-
 #[derive(Clone, serde::Serialize)]
 struct Payload {
   args: Vec<String>,
@@ -144,29 +135,6 @@ fn main() {
     .plugin(tauri_plugin_process::init())
     .plugin(tauri_plugin_os::init())
     .plugin(tauri_plugin_window::init())
-    .setup(|app| {
-      #[cfg(target_os = "macos")]
-      let main_window = app.get_window("main").unwrap();
-
-      #[cfg(target_os = "macos")]
-      main_window.position_traffic_lights(13.0, 17.0); // set inset for traffic lights (macos)
-
-      Ok(())
-    })
-    .on_window_event(|e| {
-      #[cfg(target_os = "macos")]
-      let apply_offset = || {
-        let win = e.window();
-        // keep inset for traffic lights when window resize (macos)
-        win.position_traffic_lights(13.0, 17.0);
-      };
-      #[cfg(target_os = "macos")]
-      match e.event() {
-        WindowEvent::Resized(..) => apply_offset(),
-        WindowEvent::ThemeChanged(..) => apply_offset(),
-        _ => {}
-      }
-    })
     .run(tauri::generate_context!())
     .expect("error while running tauri application");
 }

src-tauri/src/window_ext.rs

@@ -1,60 +0,0 @@
-use tauri::{Runtime, Window};
-
-pub trait WindowExt {
-  #[cfg(target_os = "macos")]
-  fn set_transparent_titlebar(&self, transparent: bool);
-  fn position_traffic_lights(&self, x: f64, y: f64);
-}
-
-impl<R: Runtime> WindowExt for Window<R> {
-  #[cfg(target_os = "macos")]
-  fn set_transparent_titlebar(&self, transparent: bool) {
-    use cocoa::appkit::{NSWindow, NSWindowTitleVisibility};
-
-    let window = self.ns_window().unwrap() as cocoa::base::id;
-
-    unsafe {
-      window.setTitleVisibility_(NSWindowTitleVisibility::NSWindowTitleHidden);
-
-      if transparent {
-        window.setTitlebarAppearsTransparent_(cocoa::base::YES);
-      } else {
-        window.setTitlebarAppearsTransparent_(cocoa::base::NO);
-      }
-    }
-  }
-
-  #[cfg(target_os = "macos")]
-  fn position_traffic_lights(&self, x: f64, y: f64) {
-    use cocoa::appkit::{NSView, NSWindow, NSWindowButton};
-    use cocoa::foundation::NSRect;
-
-    let window = self.ns_window().unwrap() as cocoa::base::id;
-
-    unsafe {
-      let close = window.standardWindowButton_(NSWindowButton::NSWindowCloseButton);
-      let miniaturize = window.standardWindowButton_(NSWindowButton::NSWindowMiniaturizeButton);
-      let zoom = window.standardWindowButton_(NSWindowButton::NSWindowZoomButton);
-
-      let title_bar_container_view = close.superview().superview();
-
-      let close_rect: NSRect = msg_send![close, frame];
-      let button_height = close_rect.size.height;
-
-      let title_bar_frame_height = button_height + y;
-      let mut title_bar_rect = NSView::frame(title_bar_container_view);
-      title_bar_rect.size.height = title_bar_frame_height;
-      title_bar_rect.origin.y = NSView::frame(window).size.height - title_bar_frame_height;
-      let _: () = msg_send![title_bar_container_view, setFrame: title_bar_rect];
-
-      let window_buttons = vec![close, miniaturize, zoom];
-      let space_between = NSView::frame(miniaturize).origin.x - NSView::frame(close).origin.x;
-
-      for (i, button) in window_buttons.into_iter().enumerate() {
-        let mut rect: NSRect = NSView::frame(button);
-        rect.origin.x = x + (i as f64 * space_between);
-        button.setFrameOrigin(rect.origin);
-      }
-    }
-  }
-}

src-tauri/tauri.conf.json

@@ -104,7 +104,8 @@
         "title": "Lume",
         "titleBarStyle": "Overlay",
         "transparent": false,
-        "width": 1080
+        "width": 1080,
+        "center": true
       }
     ]
   }