Merge branch 'master' of github.com:rust-windowing/glutin into 0.22maj

Signed-off-by: Hal Gentz <zegentzy@protonmail.com>

Author: goddessfreya

.travis.yml

@@ -36,13 +36,13 @@ matrix:
       os: osx
       rust: stable
 
-    # iOS
-    - env: TARGET=x86_64-apple-ios
-      os: osx
-      rust: nightly
-    - env: TARGET=x86_64-apple-ios
-      os: osx
-      rust: stable
+    # # iOS
+    # - env: TARGET=x86_64-apple-ios
+    #   os: osx
+    #   rust: nightly
+    # - env: TARGET=x86_64-apple-ios
+    #   os: osx
+    #   rust: stable
 
 addons:
   apt:
@@ -71,7 +71,7 @@ after_success:
         [ $TRAVIS_BRANCH = master ] &&
         [ $TRAVIS_PULL_REQUEST = false ] && {
             cd glutin
-            for crate in ../glutin_*_sys; do 
+            for crate in ../glutin_*_sys; do
                 cd "$crate"
                 cargo publish --token ${CRATESIO_TOKEN_GENTZ}
             done

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Unreleased
 
+# Version 0.22.0-alpha1 (2019-06-21)
+
+- Update winit dependency to 0.20.0-alpha1. See [winit's CHANGELOG](https://github.com/rust-windowing/winit/blob/master/CHANGELOG.md#0200-alpha-1) for more info.
+
 # Version 0.21.0-rc2 (2019-04-08)
 
  - **Breaking**: Removed `DisplayLost` variant to `ContextError`.

README.md

@@ -8,7 +8,7 @@ A low-level library for OpenGL context creation, written in pure Rust.
 
 ```toml
 [dependencies]
-glutin = "0.21"
+glutin = "0.22.0-alpha1"
 ```
 
 ## [Documentation](https://docs.rs/glutin)

glutin/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glutin"
-version = "0.21.0"
+version = "0.22.0-alpha1"
 authors = ["The glutin contributors", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "Cross-platform OpenGL context provider."
 keywords = ["windowing", "opengl"]
@@ -18,8 +18,7 @@ serde = ["winit/serde"]
 
 [dependencies]
 lazy_static = "1.3"
-#winit = "^0.19.1"
-winit = { git = "https://github.com/rust-windowing/winit.git", rev = "db794b9" }
+winit = "0.20.0-alpha1"
 log = "0.4"
 
 [target.'cfg(target_os = "android")'.dependencies]

glutin/src/platform_impl/macos/mod.rs

@@ -69,7 +69,7 @@ impl Context {
             _ => (),
         }
 
-        let view = win.nsview() as id;
+        let view = win.ns_view() as id;
 
         let gl_profile = helpers::get_gl_profile(gl_attr, pf_reqs)?;
         let attributes = helpers::build_nsattributes(pf_reqs, gl_profile)?;

glutin/src/platform_impl/windows/mod.rs

@@ -186,7 +186,7 @@ impl Context {
         }
 
         let wb = WindowBuilder::new()
-            .with_visibility(false)
+            .with_visible(false)
             .with_inner_size(size.to_logical(1.));
         Self::new_windowed(wb, &el, pf_reqs, gl_attr).map(|(win, context)| {
             match context {

glutin_examples/examples/raw_context.rs

@@ -35,7 +35,7 @@ mod this_example {
             let mut wb = WindowBuilder::new().with_title("A fantastic window!");
 
             if transparency {
-                wb = wb.with_decorations(false).with_transparency(true);
+                wb = wb.with_decorations(false).with_transparent(true);
             }
 
             #[cfg(target_os = "linux")]

glutin_examples/examples/transparent.rs

@@ -11,7 +11,7 @@ fn main() {
     let wb = WindowBuilder::new()
         .with_title("A transparent window!")
         .with_decorations(false)
-        .with_transparency(true);
+        .with_transparent(true);
 
     let windowed_context =
         ContextBuilder::new().build_windowed(wb, &el).unwrap();