Merge pull request #1262 from mitchmindtree/winit_versions

Support different versions of winit for different backends

Author: mitchmindtree

backends/conrod_gfx/Cargo.toml

@@ -29,3 +29,4 @@ petgraph = "0.4"
 ## glutin_gfx.rs example dependencies
 gfx_window_glutin = "0.28"
 glutin = "0.19"
+winit = "0.18"

backends/conrod_gfx/examples/all_winit_gfx.rs

@@ -8,15 +8,15 @@
 extern crate conrod_core;
 extern crate conrod_example_shared;
 extern crate conrod_gfx;
+#[macro_use]
 extern crate conrod_winit;
 extern crate gfx;
 extern crate gfx_core;
 extern crate gfx_window_glutin;
 extern crate glutin;
 extern crate find_folder;
 extern crate image;
-
-use self::conrod_winit::winit;
+extern crate winit;
 
 use conrod_example_shared::{WIN_W, WIN_H};
 use gfx::Device;
@@ -25,6 +25,24 @@ const CLEAR_COLOR: [f32; 4] = [0.2, 0.2, 0.2, 1.0];
 
 type DepthFormat = gfx::format::DepthStencil;
 
+// A wrapper around the winit window that allows us to implement the trait necessary for enabling
+// the winit <-> conrod conversion functions.
+struct WindowRef<'a>(&'a winit::Window);
+
+// Implement the `WinitWindow` trait for `WindowRef` to allow for generating compatible conversion
+// functions.
+impl<'a> conrod_winit::WinitWindow for WindowRef<'a> {
+    fn get_inner_size(&self) -> Option<(u32, u32)> {
+        winit::Window::get_inner_size(&self.0).map(Into::into)
+    }
+    fn hidpi_factor(&self) -> f32 {
+        winit::Window::get_hidpi_factor(&self.0) as _
+    }
+}
+
+// Generate the winit <-> conrod_core type conversion fns.
+conrod_winit::conversion_fns!();
+
 fn main() {
     // Builder for window
     let builder = glutin::WindowBuilder::new()
@@ -121,7 +139,7 @@ fn main() {
         events_loop.poll_events(|event|{
 
             // Convert winit event to conrod event, requires conrod to be built with the `winit` feature
-            if let Some(event) = conrod_winit::convert_event(event.clone(), window.window()) {
+            if let Some(event) = convert_event(event.clone(), &WindowRef(window.window())) {
                 ui.handle_event(event);
             }
 

backends/conrod_glium/Cargo.toml

@@ -26,3 +26,4 @@ find_folder = "0.3.0"
 image = "0.21"
 petgraph = "0.4"
 rand = "0.6"
+winit = "0.18"

backends/conrod_glium/examples/all_winit_glium.rs

@@ -2,6 +2,7 @@
 extern crate conrod_core;
 extern crate conrod_example_shared;
 extern crate conrod_glium;
+#[macro_use]
 extern crate conrod_winit;
 extern crate find_folder;
 extern crate glium;
@@ -77,7 +78,7 @@ fn main() {
         for event in event_loop.next(&mut events_loop) {
 
             // Use the `winit` backend feature to convert the winit event to a conrod one.
-            if let Some(event) = conrod_winit::convert_event(event.clone(), &display) {
+            if let Some(event) = support::convert_event(event.clone(), &display) {
                 ui.handle_event(event);
                 event_loop.needs_update();
             }

backends/conrod_glium/examples/all_winit_glium_threaded.rs

@@ -4,6 +4,7 @@
 extern crate conrod_core;
 extern crate conrod_example_shared;
 extern crate conrod_glium;
+#[macro_use]
 extern crate conrod_winit;
 extern crate find_folder;
 extern crate glium;
@@ -154,7 +155,7 @@ fn main() {
 
         events_loop.run_forever(|event| {
             // Use the `winit` backend feature to convert the winit event to a conrod one.
-            if let Some(event) = conrod_winit::convert_event(event.clone(), &display) {
+            if let Some(event) = support::convert_event(event.clone(), &display) {
                 event_tx.send(event).unwrap();
             }
 

backends/conrod_glium/examples/canvas.rs

@@ -2,7 +2,7 @@
 
 #[macro_use] extern crate conrod_core;
 extern crate conrod_glium;
-extern crate conrod_winit;
+#[macro_use] extern crate conrod_winit;
 extern crate find_folder;
 extern crate glium;
 extern crate image;
@@ -52,7 +52,7 @@ fn main() {
         for event in event_loop.next(&mut events_loop) {
 
             // Use the `winit` backend feature to convert the winit event to a conrod one.
-            if let Some(event) = conrod_winit::convert_event(event.clone(), &display) {
+            if let Some(event) = support::convert_event(event.clone(), &display) {
                 ui.handle_event(event);
                 event_loop.needs_update();
             }

backends/conrod_glium/examples/counter.rs

@@ -1,6 +1,6 @@
 #[macro_use] extern crate conrod_core;
 extern crate conrod_glium;
-extern crate conrod_winit;
+#[macro_use] extern crate conrod_winit;
 extern crate find_folder;
 extern crate glium;
 
@@ -53,7 +53,7 @@ fn main() {
         for event in event_loop.next(&mut events_loop) {
 
             // Use the `winit` backend feature to convert the winit event to a conrod one.
-            if let Some(event) = conrod_winit::convert_event(event.clone(), &display) {
+            if let Some(event) = support::convert_event(event.clone(), &display) {
                 ui.handle_event(event);
                 event_loop.needs_update();
             }

backends/conrod_glium/examples/custom_widget.rs

@@ -13,7 +13,7 @@
 
 #[macro_use] extern crate conrod_core;
 extern crate conrod_glium;
-extern crate conrod_winit;
+#[macro_use] extern crate conrod_winit;
 extern crate find_folder;
 extern crate glium;
 
@@ -288,7 +288,7 @@ fn main() {
         for event in event_loop.next(&mut events_loop) {
 
             // Use the `winit` backend feature to convert the winit event to a conrod one.
-            if let Some(event) = conrod_winit::convert_event(event.clone(), &display) {
+            if let Some(event) = support::convert_event(event.clone(), &display) {
                 ui.handle_event(event);
                 event_loop.needs_update();
             }

backends/conrod_glium/examples/file_navigator.rs

@@ -1,6 +1,6 @@
 #[macro_use] extern crate conrod_core;
 extern crate conrod_glium;
-extern crate conrod_winit;
+#[macro_use] extern crate conrod_winit;
 extern crate find_folder;
 extern crate glium;
 
@@ -52,7 +52,7 @@ fn main() {
         for event in event_loop.next(&mut events_loop) {
 
             // Use the `winit` backend feature to convert the winit event to a conrod one.
-            if let Some(event) = conrod_winit::convert_event(event.clone(), &display) {
+            if let Some(event) = support::convert_event(event.clone(), &display) {
                 ui.handle_event(event);
                 event_loop.needs_update();
             }

backends/conrod_glium/examples/graph.rs

@@ -2,7 +2,7 @@
 
 #[macro_use] extern crate conrod_core;
 extern crate conrod_glium;
-extern crate conrod_winit;
+#[macro_use] extern crate conrod_winit;
 extern crate find_folder;
 extern crate glium;
 extern crate petgraph;
@@ -87,7 +87,7 @@ fn main() {
         for event in event_loop.next(&mut events_loop) {
 
             // Use the `winit` backend feature to convert the winit event to a conrod one.
-            if let Some(event) = conrod_winit::convert_event(event.clone(), &display) {
+            if let Some(event) = support::convert_event(event.clone(), &display) {
                 ui.handle_event(event);
                 event_loop.needs_update();
             }