Merge pull request #107 from malikolivier/fix-winit-warning

examples: Fix winit deprecation warnings
This commit is contained in:
Joonas Javanainen 2018-03-15 21:17:35 +02:00 committed by GitHub
commit d3261f17bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions

View File

@ -105,8 +105,12 @@ pub fn run<F: FnMut(&Ui) -> 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) {

View File

@ -131,8 +131,12 @@ pub fn run<F: FnMut(&Ui) -> 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) {