updated to winit 0.30

Author: sanbox-irl

Cargo.toml

@@ -11,4 +11,4 @@ categories = ["gui"]
 
 [dependencies]
 imgui = "0.12.0"
-winit = { version = "0.29.3", default-features = false }
+winit = { version = "0.30", default-features = false }

README.md

@@ -21,57 +21,67 @@ use imgui::Context;
 use imgui_winit_support::{HiDpiMode, WinitPlatform};
 use std::time::Instant;
 use winit::event::{Event, WindowEvent};
-use winit::event_loop::{ControlFlow, EventLoop};
-use winit::window::Window;
+use winit::event_loop::EventLoop;
+use winit::window::WindowAttributes;
 
-let mut event_loop = EventLoop::new().expect("Failed to create EventLoop");
-let mut window = Window::new(&event_loop).unwrap();
+let event_loop = EventLoop::new().expect("Failed to create EventLoop");
+let window = event_loop
+    .create_window(WindowAttributes::default())
+    .expect("couldn't create window");
 
 let mut imgui = Context::create();
 // configure imgui-rs Context if necessary
 
-let mut platform = WinitPlatform::init(&mut imgui); // step 1
+let mut platform = WinitPlatform::new(&mut imgui); // step 1
 platform.attach_window(imgui.io_mut(), &window, HiDpiMode::Default); // step 2
 
 let mut last_frame = Instant::now();
-let mut run = true;
-event_loop.run(move |event, window_target| {
-    match event {
-        Event::NewEvents(_) => {
-            // other application-specific logic
-            let now = Instant::now();
-            imgui.io_mut().update_delta_time(now - last_frame);
-            last_frame = now;
-        },
-        Event::AboutToWait => {
-            // other application-specific logic
-            platform.prepare_frame(imgui.io_mut(), &window) // step 4
-                .expect("Failed to prepare frame");
-            window.request_redraw();
-        }
-        Event::WindowEvent { event: WindowEvent::RedrawRequested, .. } => {
-            let ui = imgui.frame();
-            // application-specific rendering *under the UI*
-
-            // construct the UI
-
-            platform.prepare_render(&ui, &window); // step 5
-            // render the UI with a renderer
-            let draw_data = imgui.render();
-            // renderer.render(..., draw_data).expect("UI rendering failed");
-
-            // application-specific rendering *over the UI*
-        },
-        Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => {
-            window_target.exit();
-        }
-        // other application-specific event handling
-        event => {
-            platform.handle_event(imgui.io_mut(), &window, &event); // step 3
+event_loop
+    .run(move |event, window_target| {
+        match event {
+            Event::NewEvents(_) => {
+                // other application-specific logic
+                let now = Instant::now();
+                imgui.io_mut().update_delta_time(now - last_frame);
+                last_frame = now;
+            }
+            Event::AboutToWait => {
+                // other application-specific logic
+                platform
+                    .prepare_frame(imgui.io_mut(), &window) // step 4
+                    .expect("Failed to prepare frame");
+                window.request_redraw();
+            }
+            Event::WindowEvent {
+                event: WindowEvent::RedrawRequested,
+                ..
+            } => {
+                let ui = imgui.frame();
+                // application-specific rendering *under the UI*
+
+                // construct the UI
+
+                platform.prepare_render(ui, &window); // step 5
+                                                      // render the UI with a renderer
+                let draw_data = imgui.render();
+                // renderer.render(..., draw_data).expect("UI rendering failed");
+
+                // application-specific rendering *over the UI*
+            }
+            Event::WindowEvent {
+                event: WindowEvent::CloseRequested,
+                ..
+            } => {
+                window_target.exit();
+            }
             // other application-specific event handling
+            event => {
+                platform.handle_event(imgui.io_mut(), &window, &event); // step 3
+                                                                        // other application-specific event handling
+            }
         }
-    }
-}).expect("EventLoop error");
+    })
+    .expect("EventLoop error");
 ```
 
 ## License

src/lib.rs

@@ -366,7 +366,7 @@ impl CursorSettings {
         match self.cursor {
             Some(mouse_cursor) if !self.draw_cursor => {
                 window.set_cursor_visible(true);
-                window.set_cursor_icon(to_winit_cursor(mouse_cursor));
+                window.set_cursor(to_winit_cursor(mouse_cursor));
             }
             _ => window.set_cursor_visible(false),
         }