Update to winit 0.27.2, glutin 0.29.0, glium 0.32 (emilk#1914)

/ · Aug 14, 2022 · 923b67e · 923b67e
1 parent 38a67f8
commit 923b67e
Show file tree

Hide file tree

Showing 12 changed files with 311 additions and 161 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/eframe/Cargo.toml b/eframe/Cargo.toml
@@ -83,8 +83,8 @@ wgpu = { version = "0.13", optional = true }
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 dark-light = { version = "0.2.1", optional = true }
 egui-winit = { version = "0.18.0", path = "../egui-winit", default-features = false, features = ["clipboard", "links"] }
-glutin = { version = "0.28.0" }
-winit = "0.26.1"
+glutin = { version = "0.29.0" }
+winit = "0.27.2"
 
 # optional native:
 puffin = { version = "0.13", optional = true }

diff --git a/eframe/src/native/run.rs b/eframe/src/native/run.rs
@@ -424,7 +424,7 @@ mod glow_integration {
         native_options: &epi::NativeOptions,
         app_creator: epi::AppCreator,
     ) {
-        let event_loop = EventLoop::with_user_event();
+        let event_loop = glutin::event_loop::EventLoopBuilder::with_user_event().build();
         let glow_eframe = GlowWinitApp::new(&event_loop, app_name, native_options, app_creator);
 
         if native_options.run_and_return {
@@ -682,7 +682,7 @@ mod wgpu_integration {
         native_options: &epi::NativeOptions,
         app_creator: epi::AppCreator,
     ) {
-        let event_loop = EventLoop::with_user_event();
+        let event_loop = winit::event_loop::EventLoopBuilder::with_user_event().build();
         let wgpu_eframe = WgpuWinitApp::new(&event_loop, app_name, native_options, app_creator);
 
         if native_options.run_and_return {

diff --git a/egui-wgpu/Cargo.toml b/egui-wgpu/Cargo.toml
@@ -47,4 +47,4 @@ wgpu = "0.13"
 document-features = { version = "0.2", optional = true }
 
 pollster = { version = "0.2", optional = true }
-winit = { version = "0.26", optional = true }
+winit = { version = "0.27.2", optional = true }
diff --git a/egui-winit/Cargo.toml b/egui-winit/Cargo.toml
@@ -46,7 +46,7 @@ egui = { version = "0.18.0", path = "../egui", default-features = false, feature
 ] }
 instant = { version = "0.1", features = ["wasm-bindgen"] } # We use instant so we can (maybe) compile for web
 tracing = { version = "0.1", default-features = false, features = ["std"] }
-winit = "0.26.1"
+winit = "0.27.2"
 
 #! ### Optional dependencies
 arboard = { version = "2.1", optional = true, default-features = false }

diff --git a/egui-winit/src/lib.rs b/egui-winit/src/lib.rs
@@ -400,7 +400,7 @@ impl State {
     }
 
     fn on_mouse_wheel(&mut self, delta: winit::event::MouseScrollDelta) {
-        let mut delta = match delta {
+        let delta = match delta {
             winit::event::MouseScrollDelta::LineDelta(x, y) => {
                 let points_per_scroll_line = 50.0; // Scroll speed decided by consensus: https://github.com/emilk/egui/issues/461
                 egui::vec2(x, y) * points_per_scroll_line
@@ -410,8 +410,6 @@ impl State {
             }
         };
 
-        delta.x *= -1.0; // Winit has inverted hscroll. Remove this line when we update winit after https://github.com/rust-windowing/winit/pull/2105 is merged and released
-
         if self.egui_input.modifiers.ctrl || self.egui_input.modifiers.command {
             // Treat as zoom instead:
             let factor = (delta.y / 200.0).exp();

diff --git a/egui-winit/src/window_settings.rs b/egui-winit/src/window_settings.rs
@@ -4,7 +4,7 @@
 pub struct WindowSettings {
     /// Position of window in physical pixels. This is either
     /// the inner or outer position depending on the platform.
-    /// See [`winit::window::WindowAttributes`] for details.
+    /// See [`winit::window::WindowBuilder::with_position`] for details.
     position: Option<egui::Pos2>,
 
     fullscreen: bool,

diff --git a/egui_glium/Cargo.toml b/egui_glium/Cargo.toml
@@ -46,7 +46,7 @@ egui-winit = { version = "0.18.0", path = "../egui-winit", default-features = fa
 
 ahash = "0.7"
 bytemuck = "1.7"
-glium = "0.31"
+glium = "0.32"
 
 #! ### Optional dependencies
 ## Enable this when generating docs.

diff --git a/egui_glium/examples/native_texture.rs b/egui_glium/examples/native_texture.rs
@@ -3,7 +3,7 @@
 use glium::glutin;
 
 fn main() {
-    let event_loop = glutin::event_loop::EventLoop::with_user_event();
+    let event_loop = glutin::event_loop::EventLoopBuilder::with_user_event().build();
     let display = create_display(&event_loop);
 
     let mut egui_glium = egui_glium::EguiGlium::new(&display, &event_loop);

diff --git a/egui_glium/examples/pure_glium.rs b/egui_glium/examples/pure_glium.rs
@@ -5,7 +5,7 @@
 use glium::glutin;
 
 fn main() {
-    let event_loop = glutin::event_loop::EventLoop::with_user_event();
+    let event_loop = glutin::event_loop::EventLoopBuilder::with_user_event().build();
     let display = create_display(&event_loop);
 
     let mut egui_glium = egui_glium::EguiGlium::new(&display, &event_loop);

diff --git a/egui_glow/Cargo.toml b/egui_glow/Cargo.toml
@@ -72,7 +72,7 @@ wasm-bindgen = { version = "0.2" }
 
 
 [dev-dependencies]
-glutin = "0.28.0" # examples/pure_glow
+glutin = "0.29.0" # examples/pure_glow
 
 
 [[example]]

diff --git a/egui_glow/examples/pure_glow.rs b/egui_glow/examples/pure_glow.rs
@@ -6,7 +6,7 @@
 fn main() {
     let mut clear_color = [0.1, 0.1, 0.1];
 
-    let event_loop = glutin::event_loop::EventLoop::with_user_event();
+    let event_loop = glutin::event_loop::EventLoopBuilder::with_user_event().build();
     let (gl_window, gl) = create_display(&event_loop);
     let gl = std::sync::Arc::new(gl);