alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-25 06:41:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Use NSFullSizeContentViewWindowMask for decoration-less windows

Browse source
This commit is contained in:
Paul Rouget 2015-09-21 12:58:23 +02:00
parent 0f9693bde4
commit 67a31c6221
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/api/cocoa/mod.rs
View file

@ -399,14 +399,24 @@ impl Window {
} }
}; };
let masks = if screen.is_some() || !attrs.decorations { let masks = match (attrs.decorations, attrs.transparent) {
NSBorderlessWindowMask as NSUInteger | (true, false) =>
NSResizableWindowMask as NSUInteger // Classic opaque window with titlebar
} else { NSClosableWindowMask as NSUInteger |
NSTitledWindowMask as NSUInteger | NSMiniaturizableWindowMask as NSUInteger |
NSClosableWindowMask as NSUInteger | NSResizableWindowMask as NSUInteger |
NSMiniaturizableWindowMask as NSUInteger | NSTitledWindowMask as NSUInteger,
NSResizableWindowMask as NSUInteger (false, false) =>
// Opaque window without a titlebar
NSClosableWindowMask as NSUInteger |
NSMiniaturizableWindowMask as NSUInteger |
NSResizableWindowMask as NSUInteger |
NSTitledWindowMask as NSUInteger |
NSFullSizeContentViewWindowMask as NSUInteger,
(_, true) =>
// Fully transparent window.
// No shadow, decorations or borders.
NSBorderlessWindowMask as NSUInteger
}; };
let window = IdRef::new(NSWindow::alloc(nil).initWithContentRect_styleMask_backing_defer_( let window = IdRef::new(NSWindow::alloc(nil).initWithContentRect_styleMask_backing_defer_(
@ -419,6 +429,12 @@ impl Window {
let title = IdRef::new(NSString::alloc(nil).init_str(&attrs.title)); let title = IdRef::new(NSString::alloc(nil).init_str(&attrs.title));
window.setTitle_(*title); window.setTitle_(*title);
window.setAcceptsMouseMovedEvents_(YES); window.setAcceptsMouseMovedEvents_(YES);
if !attrs.decorations {
window.setTitleVisibility_(NSWindowTitleVisibility::NSWindowTitleHidden);
window.setTitlebarAppearsTransparent_(YES);
}
if screen.is_some() { if screen.is_some() {
window.setLevel_(NSMainMenuWindowLevel as i64 + 1); window.setLevel_(NSMainMenuWindowLevel as i64 + 1);
} }