Skip to content

Commit

Permalink
Auto merge of rust-windowing#78 - paulrouget:glutinUpdate, r=glennw
Browse files Browse the repository at this point in the history
Glutin update

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/glutin/78)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Mar 16, 2016
2 parents 0ae49fe + cc306fe commit 3630ced
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "servo-glutin"
version = "0.4.10"
version = "0.4.11"
authors = ["The glutin contributors, Pierre Krieger <[email protected]>"]
description = "Cross-platform OpenGL context provider."
keywords = ["windowing", "opengl"]
Expand Down Expand Up @@ -49,7 +49,7 @@ objc = "0.1.8"
cgl = "0.1"
cocoa = "0.2.4"
core-foundation = "0"
core-graphics = "0"
core-graphics = "0.3"

[target.i686-pc-windows-gnu.dependencies]
winapi = "0.2"
Expand Down
4 changes: 3 additions & 1 deletion src/api/cocoa/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down

0 comments on commit 3630ced

Please sign in to comment.