Skip to content

Commit e86cd88

Browse files
committed
examples: Fix winit deprecation warnings
Since the following pull request rust-windowing/winit#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.
1 parent bafe886 commit e86cd88

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

imgui-examples/examples/support/mod.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,12 @@ pub fn run<F: FnMut(&Ui) -> bool>(title: String, clear_color: [f32; 4], mut run_
105105
update_mouse(&mut imgui, &mut mouse_state);
106106

107107
let gl_window = display.gl_window();
108-
let size_points = gl_window.get_inner_size_points().unwrap();
109-
let size_pixels = gl_window.get_inner_size_pixels().unwrap();
108+
let size_pixels = gl_window.get_inner_size().unwrap();
109+
let hdipi = gl_window.hidpi_factor();
110+
let size_points = (
111+
(size_pixels.0 as f32 / hdipi) as u32,
112+
(size_pixels.1 as f32 / hdipi) as u32,
113+
);
110114

111115
let ui = imgui.frame(size_points, size_pixels, delta_s);
112116
if !run_ui(&ui) {

imgui-examples/examples/support_gfx/mod.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,12 @@ pub fn run<F: FnMut(&Ui) -> bool>(title: String, clear_color: [f32; 4], mut run_
131131

132132
update_mouse(&mut imgui, &mut mouse_state);
133133

134-
let size_points = window.get_inner_size_points().unwrap();
135-
let size_pixels = window.get_inner_size_pixels().unwrap();
134+
let size_pixels = window.get_inner_size().unwrap();
135+
let hdipi = window.hidpi_factor();
136+
let size_points = (
137+
(size_pixels.0 as f32 / hdipi) as u32,
138+
(size_pixels.1 as f32 / hdipi) as u32,
139+
);
136140

137141
let ui = imgui.frame(size_points, size_pixels, delta_s);
138142
if !run_ui(&ui) {

0 commit comments

Comments
 (0)