btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

fix: window controls not visible on macos when on light theme in dark mode

Browse Source
This commit is contained in:
Andrew Bastin
2023-11-03 15:10:03 +05:30
parent cdf9c31935
commit 39b2dab3c9
1 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/hoppscotch-selfhost-desktop/src-tauri/src/mac/window.rs
View File

@@ -29,18 +29,22 @@ unsafe fn set_transparent_titlebar(id: cocoa::base::id) {
id.setTitlebarAppearsTransparent_(cocoa::base::YES); id.setTitlebarAppearsTransparent_(cocoa::base::YES);
id.setTitleVisibility_(cocoa::appkit::NSWindowTitleVisibility::NSWindowTitleHidden); id.setTitleVisibility_(cocoa::appkit::NSWindowTitleVisibility::NSWindowTitleHidden);
} }
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
fn set_window_controls_pos(window: cocoa::base::id, x: f64, y: f64) { fn set_window_controls_pos(window: cocoa::base::id, x: f64, y: f64) {
use cocoa::{appkit::{NSWindow, NSWindowButton, NSView}, foundation::NSRect}; use cocoa::{
appkit::{NSAppearance, NSAppearanceNameVibrantLight, NSView, NSWindow, NSWindowButton},
foundation::NSRect,
};
unsafe { unsafe {
// Set appearance windows to be light for better visibility when on light theme
// TODO: Detect when on dark theme and set to dark and on light switch to light
NSWindow::setAppearance(window, NSAppearance(NSAppearanceNameVibrantLight));
let close = window.standardWindowButton_(NSWindowButton::NSWindowCloseButton); let close = window.standardWindowButton_(NSWindowButton::NSWindowCloseButton);
let miniaturize = let miniaturize = window.standardWindowButton_(NSWindowButton::NSWindowMiniaturizeButton);
window.standardWindowButton_(NSWindowButton::NSWindowMiniaturizeButton);
let zoom = window.standardWindowButton_(NSWindowButton::NSWindowZoomButton); let zoom = window.standardWindowButton_(NSWindowButton::NSWindowZoomButton);
let title_bar_container_view = close.superview().superview(); let title_bar_container_view = close.superview().superview();
@@ -303,9 +307,7 @@ pub fn setup_mac_window(app: &mut App) {
// } // }
// Are we deallocing this properly ? (I miss safe Rust :( ) // Are we deallocing this properly ? (I miss safe Rust :( )
let app_state = HoppAppState { let app_state = HoppAppState { window };
window,
};
let app_box = Box::into_raw(Box::new(app_state)) as *mut c_void; let app_box = Box::into_raw(Box::new(app_state)) as *mut c_void;
ns_win.setDelegate_(delegate!("MainWindowDelegate", { ns_win.setDelegate_(delegate!("MainWindowDelegate", {
@@ -339,7 +341,5 @@ pub fn setup_mac_window(app: &mut App) {
})) }))
} }
app.get_window("main") app.get_window("main").unwrap().set_transparent_titlebar();
.unwrap()
.set_transparent_titlebar();
} }