From 6b5e923e8e28cb18c9dc8a01d062fe8f181b1591 Mon Sep 17 00:00:00 2001 From: Yuri Karamian Date: Fri, 24 Jul 2026 16:31:38 +0200 Subject: [PATCH] Fix macOS traffic light alignment --- src-tauri/Cargo.lock | 1 - src-tauri/Cargo.toml | 3 --- src-tauri/src/lib.rs | 50 -------------------------------------------- 3 files changed, 54 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 303c1d8..8229dd4 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -1860,7 +1860,6 @@ dependencies = [ "image", "log", "notify", - "objc2-app-kit", "png 0.17.16", "quick-xml 0.36.2", "rayon", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 397986d..30ecb32 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -42,9 +42,6 @@ quick-xml = "0.36" urlencoding = "2" sha2 = "0.10" rustls = { version = "0.23", default-features = false, features = ["ring", "logging", "std", "tls12"] } -[target.'cfg(target_os = "macos")'.dependencies] -objc2-app-kit = "0.3.2" - [target.'cfg(target_os = "ios")'.dependencies] tauri-plugin-ios-vault-access = { path = "plugins/ios-vault-access" } diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 1383135..ee02109 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -88,13 +88,6 @@ pub fn run() { setup_tray(app)?; } - #[cfg(target_os = "macos")] - { - if let Some(window) = app.get_webview_window("main") { - fix_macos_traffic_lights(&window); - } - } - // Check CLI args for a .md file path on initial launch #[cfg(desktop)] { @@ -399,46 +392,3 @@ fn percent_decode(input: &str) -> String { } String::from_utf8_lossy(&output).to_string() } - -#[cfg(target_os = "macos")] -fn fix_macos_traffic_lights(window: &tauri::WebviewWindow) { - use objc2_app_kit::{NSView, NSWindow, NSWindowButton}; - - let ns_window_ptr = match window.ns_window() { - Ok(ptr) => ptr, - Err(_) => return, - }; - - let ns_window: &NSWindow = unsafe { &*(ns_window_ptr as *const NSWindow) }; - - let close = match ns_window.standardWindowButton(NSWindowButton::CloseButton) { - Some(btn) => btn, - None => return, - }; - let miniaturize = match ns_window.standardWindowButton(NSWindowButton::MiniaturizeButton) { - Some(btn) => btn, - None => return, - }; - let zoom = match ns_window.standardWindowButton(NSWindowButton::ZoomButton) { - Some(btn) => btn, - None => return, - }; - - let superview = match unsafe { close.superview() } { - Some(sv) => sv, - None => return, - }; - - let sv_height = NSView::frame(&superview).size.height; - let btn_height = NSView::frame(&close).size.height; - if sv_height <= 0.0 || btn_height <= 0.0 { - return; - } - let centered_y = (sv_height - btn_height) / 2.0; - - for btn in [&close, &miniaturize, &zoom] { - let mut frame = NSView::frame(btn); - frame.origin.y = centered_y; - btn.setFrameOrigin(frame.origin); - } -}