From b08f3bfe291ca2a222f7b79da9c0e8f6478b66d2 Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Thu, 12 Nov 2020 23:24:14 +0100 Subject: [PATCH 1/3] imgui-winit-support: Compile doctest on winit 20+ --- imgui-winit-support/src/lib.rs | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/imgui-winit-support/src/lib.rs b/imgui-winit-support/src/lib.rs index 3c2c65d..f8668ed 100644 --- a/imgui-winit-support/src/lib.rs +++ b/imgui-winit-support/src/lib.rs @@ -15,8 +15,30 @@ //! //! ## Complete example for winit 0.20+ (without a renderer) //! -//! ```rust,no_run,ignore -//! # // TODO: Remove ignore when only one winit version is used +//! ```no_run +//! # #[cfg(feature = "winit-19")] +//! # fn main() {} +//! # +//! # #[cfg(not(feature = "winit-19"))] +//! # fn main() { +//! # #[cfg(feature = "winit-20")] +//! # use winit_20 as winit; +//! # +//! # #[cfg(feature = "winit-22")] +//! # use winit_22 as winit; +//! # +//! # #[cfg(feature = "winit-23")] +//! # use winit_23 as winit; +//! # +//! # #[cfg(feature = "winit-24")] +//! # use winit_24 as winit; +//! # +//! # #[cfg(feature = "winit-25")] +//! # use winit_25 as winit; +//! # +//! # #[cfg(feature = "winit-26")] +//! # use winit_26 as winit; +//! # //! use imgui::Context; //! use imgui_winit_support::{HiDpiMode, WinitPlatform}; //! use std::time::Instant; @@ -70,6 +92,7 @@ //! } //! } //! }) +//! # } //! ``` //! //! ## `winit` versions and features. From 055c16b4e2ff007fc21277e52072b9bd196dffc6 Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Thu, 12 Nov 2020 23:38:03 +0100 Subject: [PATCH 2/3] imgui-winit-support: Fix use of update_delta_time in example doc --- imgui-winit-support/src/lib.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/imgui-winit-support/src/lib.rs b/imgui-winit-support/src/lib.rs index f8668ed..4a4b057 100644 --- a/imgui-winit-support/src/lib.rs +++ b/imgui-winit-support/src/lib.rs @@ -61,7 +61,9 @@ //! match event { //! Event::NewEvents(_) => { //! // other application-specific logic -//! last_frame = imgui.io_mut().update_delta_time(last_frame); +//! let now = Instant::now(); +//! imgui.io_mut().update_delta_time(now - last_frame); +//! last_frame = now; //! }, //! Event::MainEventsCleared => { //! // other application-specific logic From db71313f04e087393d58b97e046755905997593a Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Tue, 15 Mar 2022 14:01:50 +0100 Subject: [PATCH 3/3] imgui-winit-support: Get `DrawData` from `Context` instead of `Ui` As per a recent deprecation change scheduled for the 0.9 release. --- imgui-winit-support/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imgui-winit-support/src/lib.rs b/imgui-winit-support/src/lib.rs index 4a4b057..ef3847c 100644 --- a/imgui-winit-support/src/lib.rs +++ b/imgui-winit-support/src/lib.rs @@ -79,7 +79,7 @@ //! //! platform.prepare_render(&ui, &window); // step 5 //! // render the UI with a renderer -//! let draw_data = ui.render(); +//! let draw_data = imgui.render(); //! // renderer.render(..., draw_data).expect("UI rendering failed"); //! //! // application-specific rendering *over the UI*