Merge pull request #10573 from nshcr/fix-traffic-lights-inset

fix: move traffic lights inset setup to window creation

Author: Byron

crates/gitbutler-tauri/src/main.rs

@@ -177,20 +177,6 @@ fn main() {
                         menu::handle_event(handle, &window.clone(), &event)
                     });
 
-                    #[cfg(target_os = "macos")]
-                    use tauri::LogicalPosition;
-                    #[cfg(target_os = "macos")]
-                    use tauri_plugin_trafficlights_positioner::WindowExt;
-                    #[cfg(target_os = "macos")]
-                    // NOTE: Make sure you only call this ONCE per window.
-                    {
-                        if let Some(window) = tauri_app.get_window("main") {
-                            #[cfg(target_os = "macos")]
-                            // NOTE: Make sure you only call this ONCE per window.
-                            window.setup_traffic_lights_inset(LogicalPosition::new(16.0, 25.0))?;
-                        };
-                    }
-
                     Ok(())
                 })
                 .plugin(tauri_plugin_http::init())

crates/gitbutler-tauri/src/window.rs

@@ -320,5 +320,15 @@ pub fn create(
     .disable_drag_drop_handler()
     .title_bar_style(tauri::TitleBarStyle::Overlay)
     .build()?;
+
+    use tauri::LogicalPosition;
+    use tauri::Manager;
+    use tauri_plugin_trafficlights_positioner::WindowExt;
+    if let Some(window) = window.get_window(label) {
+        // Note that these lights get reset when the Window label is changed!
+        // See https://github.com/tauri-apps/tauri/issues/13044 .
+        window.setup_traffic_lights_inset(LogicalPosition::new(16.0, 28.0))?;
+    }
+
     Ok(window)
 }