From 67a31c622140a27830f5b5c1bd4eabfc6c44a0a0 Mon Sep 17 00:00:00 2001 From: Paul Rouget Date: Mon, 21 Sep 2015 12:58:23 +0200 Subject: Use NSFullSizeContentViewWindowMask for decoration-less windows --- src/api/cocoa/mod.rs | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/src/api/cocoa/mod.rs b/src/api/cocoa/mod.rs index 539545c..f602f1f 100644 --- a/src/api/cocoa/mod.rs +++ b/src/api/cocoa/mod.rs @@ -399,14 +399,24 @@ impl Window { } }; - let masks = if screen.is_some() || !attrs.decorations { - NSBorderlessWindowMask as NSUInteger | - NSResizableWindowMask as NSUInteger - } else { - NSTitledWindowMask as NSUInteger | - NSClosableWindowMask as NSUInteger | - NSMiniaturizableWindowMask as NSUInteger | - NSResizableWindowMask as NSUInteger + let masks = match (attrs.decorations, attrs.transparent) { + (true, false) => + // Classic opaque window with titlebar + NSClosableWindowMask as NSUInteger | + NSMiniaturizableWindowMask as NSUInteger | + NSResizableWindowMask as NSUInteger | + NSTitledWindowMask 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_( @@ -419,6 +429,12 @@ impl Window { let title = IdRef::new(NSString::alloc(nil).init_str(&attrs.title)); window.setTitle_(*title); window.setAcceptsMouseMovedEvents_(YES); + + if !attrs.decorations { + window.setTitleVisibility_(NSWindowTitleVisibility::NSWindowTitleHidden); + window.setTitlebarAppearsTransparent_(YES); + } + if screen.is_some() { window.setLevel_(NSMainMenuWindowLevel as i64 + 1); } -- cgit v1.2.3 From 68230faeb0c239bbf3ce97a0094f9bfbfc4ea965 Mon Sep 17 00:00:00 2001 From: Paul Rouget Date: Wed, 23 Sep 2015 10:19:27 +0200 Subject: Update cocoa version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index e35bbaf..86be162 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,7 +48,7 @@ objc = "0.1" [target.x86_64-apple-darwin.dependencies] objc = "0.1" cgl = "0" -cocoa = "0" +cocoa = "0.1.4" core-foundation = "0" core-graphics = "0" -- cgit v1.2.3