From 717d0184c0da42aee24b9041a73d9505016c9c29 Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Tue, 8 Mar 2016 22:59:15 -0700 Subject: [PATCH 1/4] Pin core-graphics to 0.2 since cocoa 0.2.4 does --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index a282b6042e..cda4d75fd7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ objc = "0.1.8" cgl = "0.1" cocoa = "0.2.4" core-foundation = "0" -core-graphics = "0" +core-graphics = "0.2" [target.i686-pc-windows-gnu.dependencies] winapi = "0.2" From 7249529654afe4b3ac6628be45bd2d8bb15dcaf4 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Mon, 14 Mar 2016 15:51:10 -0700 Subject: [PATCH 2/4] Make Mac borderless windows resizable and draggable. Despite the fact that the style mask contains `NSTitledWindowMask`, the title doesn't show up for two reasons: (a) we draw over it; (b) we make it invisible with a call to `-[NSWindow setTitleVisibility:]`. Addresses servo/servo#9856 and servo/servo#9878. Partially addresses servo/servo#9812. --- src/api/cocoa/mod.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/api/cocoa/mod.rs b/src/api/cocoa/mod.rs index db3f749800..08fabddb28 100644 --- a/src/api/cocoa/mod.rs +++ b/src/api/cocoa/mod.rs @@ -404,7 +404,9 @@ impl Window { let masks = if screen.is_some() || attrs.transparent { // Fullscreen or transparent window - NSBorderlessWindowMask as NSUInteger + NSBorderlessWindowMask as NSUInteger | + NSResizableWindowMask as NSUInteger | + NSTitledWindowMask as NSUInteger } else if attrs.decorations { // Classic opaque window with titlebar NSClosableWindowMask as NSUInteger | From c0adb8d87eb929db037c2cce2082bfb5f7627119 Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Mon, 14 Mar 2016 20:22:16 -0400 Subject: [PATCH 3/4] Fix Mac build by bumping core-graphics. At the time of writing, Glutin requires 0.2.x and cocoa requires 0.3.x. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index cda4d75fd7..3a251c29ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ objc = "0.1.8" cgl = "0.1" cocoa = "0.2.4" core-foundation = "0" -core-graphics = "0.2" +core-graphics = "0.3" [target.i686-pc-windows-gnu.dependencies] winapi = "0.2" From cc306fe0bc890daef3f7b4b7135af9ba48232ae6 Mon Sep 17 00:00:00 2001 From: Paul Rouget Date: Wed, 16 Mar 2016 07:00:52 +0100 Subject: [PATCH 4/4] version bump --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 47d6d3d7de..752e6b417c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "servo-glutin" -version = "0.4.10" +version = "0.4.11" authors = ["The glutin contributors, Pierre Krieger "] description = "Cross-platform OpenGL context provider." keywords = ["windowing", "opengl"]