diff --git a/apps/desktop/src-tauri/src/window.rs b/apps/desktop/src-tauri/src/window.rs index 300ae67e5..b8fd3dabf 100644 --- a/apps/desktop/src-tauri/src/window.rs +++ b/apps/desktop/src-tauri/src/window.rs @@ -2,15 +2,15 @@ use tauri::{GlobalWindowEvent, Runtime, Window, Wry}; pub(crate) fn handle_window_event(event: GlobalWindowEvent) { match event.event() { - tauri::WindowEvent::Focused(_focus) => { - // let fullscreen = event.window().is_fullscreen().unwrap_or(false); + tauri::WindowEvent::Resized(_size) => { + let fullscreen = event.window().is_fullscreen().unwrap_or(false); - // println!("fullscreen, {}", fullscreen); + println!("fullscreen, {}", fullscreen); - // #[cfg(target_os = "macos")] - // event - // .window() - // .set_transparent_titlebar(!fullscreen, !fullscreen); + #[cfg(target_os = "macos")] + event + .window() + .set_transparent_titlebar(!fullscreen, !fullscreen); } _ => {} } @@ -56,15 +56,10 @@ impl WindowExt for Window { let id = self.ns_window().unwrap() as cocoa::base::id; let mut style_mask = id.styleMask(); - // println!("existing style mask, {:#?}", style_mask); style_mask.set( NSWindowStyleMask::NSFullSizeContentViewWindowMask, transparent, ); - style_mask.set( - NSWindowStyleMask::NSTexturedBackgroundWindowMask, - transparent, - ); style_mask.set( NSWindowStyleMask::NSUnifiedTitleAndToolbarWindowMask, transparent && large, diff --git a/packages/interface/src/App.tsx b/packages/interface/src/App.tsx index 76b8f4c01..4fc053d1a 100644 --- a/packages/interface/src/App.tsx +++ b/packages/interface/src/App.tsx @@ -36,6 +36,7 @@ import ExperimentalSettings from './screens/settings/ExperimentalSettings'; import { TagScreen } from './screens/Tag'; + const queryClient = new QueryClient(); export const AppPropsContext = React.createContext(null); @@ -61,10 +62,9 @@ function AppLayout() { const [hasWindowBorder, setHasWindowBorder] = useState(true); useEffect(() => { - // no longer need this with our window mask fixes - // if (appPropsContext?.platform === 'macOS') { - // setIsWindowRounded(false); - // } + if (appPropsContext?.platform === 'macOS') { + setIsWindowRounded(true); + } if (appPropsContext?.platform === 'browser') { setHasWindowBorder(false); }