From e86cd8838d552c6e6f8cf72604535d180e34faf5 Mon Sep 17 00:00:00 2001 From: Malik Olivier Boussejra Date: Thu, 15 Mar 2018 21:21:40 +0900 Subject: [PATCH] examples: Fix winit deprecation warnings Since the following pull request https://github.com/tomaka/winit/pull/319, `winit` has deprecated `get_inner_size_points()` and `get_inner_size_pixels()`. We replace the deprecated API by `get_inner_size()` and `hidpi_factor()`. The size in points in computed from the returned hidpi_factor. --- imgui-examples/examples/support/mod.rs | 8 ++++++-- imgui-examples/examples/support_gfx/mod.rs | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/imgui-examples/examples/support/mod.rs b/imgui-examples/examples/support/mod.rs index 3c4efac..c476955 100644 --- a/imgui-examples/examples/support/mod.rs +++ b/imgui-examples/examples/support/mod.rs @@ -105,8 +105,12 @@ pub fn run bool>(title: String, clear_color: [f32; 4], mut run_ update_mouse(&mut imgui, &mut mouse_state); let gl_window = display.gl_window(); - let size_points = gl_window.get_inner_size_points().unwrap(); - let size_pixels = gl_window.get_inner_size_pixels().unwrap(); + let size_pixels = gl_window.get_inner_size().unwrap(); + let hdipi = gl_window.hidpi_factor(); + let size_points = ( + (size_pixels.0 as f32 / hdipi) as u32, + (size_pixels.1 as f32 / hdipi) as u32, + ); let ui = imgui.frame(size_points, size_pixels, delta_s); if !run_ui(&ui) { diff --git a/imgui-examples/examples/support_gfx/mod.rs b/imgui-examples/examples/support_gfx/mod.rs index 738bc3f..ebfd030 100644 --- a/imgui-examples/examples/support_gfx/mod.rs +++ b/imgui-examples/examples/support_gfx/mod.rs @@ -131,8 +131,12 @@ pub fn run bool>(title: String, clear_color: [f32; 4], mut run_ update_mouse(&mut imgui, &mut mouse_state); - let size_points = window.get_inner_size_points().unwrap(); - let size_pixels = window.get_inner_size_pixels().unwrap(); + let size_pixels = window.get_inner_size().unwrap(); + let hdipi = window.hidpi_factor(); + let size_points = ( + (size_pixels.0 as f32 / hdipi) as u32, + (size_pixels.1 as f32 / hdipi) as u32, + ); let ui = imgui.frame(size_points, size_pixels, delta_s); if !run_ui(&ui) {