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

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

@@ -29,39 +29,43 @@ 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 {
let close = window.standardWindowButton_(NSWindowButton::NSWindowCloseButton); // Set appearance windows to be light for better visibility when on light theme
let miniaturize = // TODO: Detect when on dark theme and set to dark and on light switch to light
window.standardWindowButton_(NSWindowButton::NSWindowMiniaturizeButton); NSWindow::setAppearance(window, NSAppearance(NSAppearanceNameVibrantLight));
let zoom = window.standardWindowButton_(NSWindowButton::NSWindowZoomButton);
let title_bar_container_view = close.superview().superview(); let close = window.standardWindowButton_(NSWindowButton::NSWindowCloseButton);
let miniaturize = window.standardWindowButton_(NSWindowButton::NSWindowMiniaturizeButton);
let zoom = window.standardWindowButton_(NSWindowButton::NSWindowZoomButton);
let close_rect: NSRect = msg_send![close, frame]; let title_bar_container_view = close.superview().superview();
let button_height = close_rect.size.height;
let title_bar_frame_height = button_height + y; let close_rect: NSRect = msg_send![close, frame];
let mut title_bar_rect = NSView::frame(title_bar_container_view); let button_height = close_rect.size.height;
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 title_bar_frame_height = button_height + y;
let space_between = NSView::frame(miniaturize).origin.x - NSView::frame(close).origin.x; 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];
for (i, button) in window_buttons.into_iter().enumerate() { let window_buttons = vec![close, miniaturize, zoom];
let mut rect: NSRect = NSView::frame(button); let space_between = NSView::frame(miniaturize).origin.x - NSView::frame(close).origin.x;
rect.origin.x = x + (i as f64 * space_between);
button.setFrameOrigin(rect.origin); 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);
}
} }
} }
@@ -122,9 +126,9 @@ pub fn setup_mac_window(app: &mut App) {
extern "C" fn on_window_did_resize(this: &Object, _cmd: Sel, notification: id) { extern "C" fn on_window_did_resize(this: &Object, _cmd: Sel, notification: id) {
unsafe { unsafe {
with_hopp_app(&*this, |state| { with_hopp_app(&*this, |state| {
let id = state.window.ns_window().unwrap() as id; let id = state.window.ns_window().unwrap() as id;
set_window_controls_pos(id, WINDOW_CONTROL_PAD_X, WINDOW_CONTROL_PAD_Y); set_window_controls_pos(id, WINDOW_CONTROL_PAD_X, WINDOW_CONTROL_PAD_Y);
}); });
let super_del: id = *this.get_ivar("super_delegate"); let super_del: id = *this.get_ivar("super_delegate");
@@ -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();
} }