rework macos version

src-tauri/src/main.rs

@@ -4,7 +4,7 @@
 )]
 
 use std::time::Duration;
-use tauri::{Manager};
+use tauri::Manager;
 use tauri_plugin_autostart::MacosLauncher;
 use tauri_plugin_sql::{Migration, MigrationKind};
 use webpage::{Webpage, WebpageOptions};
@@ -92,6 +92,19 @@ async fn close_splashscreen(window: tauri::Window) {
 
 fn main() {
   tauri::Builder::default()
+    /*
+    .setup(|app| {
+      let salt_path = app
+        .path()
+        .app_local_data_dir()
+        .expect("could not resolve app local data path")
+        .join(".salt.txt");
+      app
+        .handle()
+        .plugin(tauri_plugin_stronghold::Builder::with_argon2(&salt_path).build())?;
+      Ok(())
+    })
+    */
     .plugin(tauri_plugin_app::init())
     .plugin(tauri_plugin_clipboard_manager::init())
     .plugin(tauri_plugin_dialog::init())

src-tauri/src/traffic_light.rs

@@ -1,60 +0,0 @@
-use tauri::{Runtime, Window};
-
-pub trait TrafficLight {
-  #[cfg(target_os = "macos")]
-  fn set_transparent_titlebar(&self, transparent: bool);
-  fn position_traffic_lights(&self, x: f64, y: f64);
-}
-
-impl<R: Runtime> TrafficLight 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);
-      }
-    }
-  }
-}