From ee6b1dd48557146d42fa006e80fe2bb0fbd71fc4 Mon Sep 17 00:00:00 2001
From: Johan Andersson <repi@repi.se>
Date: Sat, 22 May 2021 23:24:16 +0200
Subject: [PATCH 1/6] Add support & upgrade to winit 0.25

---
 imgui-winit-support/Cargo.toml |  3 +-
 imgui-winit-support/src/lib.rs | 78 ++++++++++++++++++++++++++--------
 2 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/imgui-winit-support/Cargo.toml b/imgui-winit-support/Cargo.toml
index 9a1f761c2..92e5a1e10 100644
--- a/imgui-winit-support/Cargo.toml
+++ b/imgui-winit-support/Cargo.toml
@@ -16,9 +16,10 @@ winit-20 = { version = ">= 0.20, < 0.22", package = "winit", optional = true }
 winit-22 = { version = "0.22", package = "winit", optional = true }
 winit-23 = { version = "0.23", package = "winit", optional = true }
 winit-24 = { version = "0.24", package = "winit", optional = true }
+winit-25 = { version = "0.25", package = "winit", optional = true }
 
 [features]
-default = ["winit-24"]
+default = ["winit-25"]
 
 # This is phrased as a negative (unlike most features) so that it needs to be
 # explicitly disabled (and `default-features = false` won't do it). To avoid
diff --git a/imgui-winit-support/src/lib.rs b/imgui-winit-support/src/lib.rs
index 3c717718b..5930b3527 100644
--- a/imgui-winit-support/src/lib.rs
+++ b/imgui-winit-support/src/lib.rs
@@ -79,9 +79,10 @@
 //!
 //! The following versions are supported, controlled by the listed feature.
 //!
-//! - The `winit-24` feature supports winit versions `0.24`. This is
+//! - The `winit-25` feature supports winit versions `0.25`. This is
 //!   on by default, so to use any other version you need to disable this crates
 //!   default features.
+//! - The `winit-24` feature uses winit versions compatible with `0.24`.
 //! - The `winit-23` feature uses winit versions compatible with `0.23`.
 //! - The `winit-22` feature uses winit versions compatible with `0.22`.
 //! - The `winit-20` feature should support winit either `0.20` or winit `0.21`.
@@ -132,26 +133,38 @@
 //! - Changing the default feature to the new latest `winit` version is *not* a
 //!   breaking change.
 
+#[cfg(feature = "winit-25")]
+use winit_25 as winit;
+
 #[cfg(feature = "winit-24")]
 use winit_24 as winit;
 
-#[cfg(all(not(feature = "winit-24"), feature = "winit-23"))]
+#[cfg(all(
+    not(any(feature = "winit-25", feature = "winit-24")),
+    feature = "winit-23"
+))]
 use winit_23 as winit;
 
 #[cfg(all(
-    not(any(feature = "winit-24", feature = "winit-23")),
+    not(any(feature = "winit-25", feature = "winit-24", feature = "winit-23")),
     feature = "winit-22",
 ))]
 use winit_22 as winit;
 
 #[cfg(all(
-    not(any(feature = "winit-24", feature = "winit-23", feature = "winit-22")),
+    not(any(
+        feature = "winit-25",
+        feature = "winit-24",
+        feature = "winit-23",
+        feature = "winit-22"
+    )),
     feature = "winit-20",
 ))]
 use winit_20 as winit;
 
 #[cfg(all(
     not(any(
+        feature = "winit-25",
         feature = "winit-24",
         feature = "winit-23",
         feature = "winit-22",
@@ -168,6 +181,7 @@ use winit::dpi::{LogicalPosition, LogicalSize};
 
 #[cfg(all(
     not(any(
+        feature = "winit-25",
         feature = "winit-24",
         feature = "winit-23",
         feature = "winit-22",
@@ -184,7 +198,8 @@ use winit::{
     feature = "winit-20",
     feature = "winit-22",
     feature = "winit-23",
-    feature = "winit-24"
+    feature = "winit-24",
+    feature = "winit-25"
 ))]
 use winit::{
     error::ExternalError,
@@ -202,6 +217,7 @@ use winit::{
     feature = "winit-22",
     feature = "winit-23",
     feature = "winit-24",
+    feature = "winit-25",
 )))]
 compile_error!("Please enable at least one version of `winit` (see documentation for details).");
 
@@ -213,7 +229,8 @@ fn check_multiple_winits() {
     if cfg!(any(not(debug_assertions), feature = "no-warn-on-multiple")) {
         return;
     }
-    let winits_enabled = cfg!(feature = "winit-24") as usize
+    let winits_enabled = cfg!(feature = "winit-25") as usize
+        + cfg!(feature = "winit-24") as usize
         + cfg!(feature = "winit-23") as usize
         + cfg!(feature = "winit-22") as usize
         + cfg!(feature = "winit-20") as usize
@@ -241,7 +258,8 @@ fn check_multiple_winits() {
         (this likely indicates misconfiguration, see documentation for details)."
     );
     let feats = [
-        ("winit-24", cfg!(feature = "winit-24"), " (default)"),
+        ("winit-25", cfg!(feature = "winit-25"), " (default)"),
+        ("winit-24", cfg!(feature = "winit-24"), ""),
         ("winit-23", cfg!(feature = "winit-23"), ""),
         ("winit-22", cfg!(feature = "winit-22"), ""),
         ("winit-20", cfg!(feature = "winit-20"), ""),
@@ -252,7 +270,7 @@ fn check_multiple_winits() {
             let _ = writeln!(err, "    `feature = {:?}` is enabled{}", name, extra);
         }
     }
-    if cfg!(feature = "winit-24") && winits_enabled == 2 {
+    if cfg!(feature = "winit-25") && winits_enabled == 2 {
         let _ = writeln!(
             err,
             "    Perhaps you are missing a `default-features = false`?",
@@ -330,6 +348,7 @@ fn to_winit_cursor(cursor: imgui::MouseCursor) -> MouseCursor {
 impl CursorSettings {
     #[cfg(all(
         not(any(
+            feature = "winit-25",
             feature = "winit-24",
             feature = "winit-23",
             feature = "winit-22",
@@ -350,7 +369,8 @@ impl CursorSettings {
         feature = "winit-20",
         feature = "winit-22",
         feature = "winit-23",
-        feature = "winit-24"
+        feature = "winit-24",
+        feature = "winit-25"
     ))]
     fn apply(&self, window: &Window) {
         match self.cursor {
@@ -458,6 +478,7 @@ impl WinitPlatform {
     /// * display size is set
     #[cfg(all(
         not(any(
+            feature = "winit-25",
             feature = "winit-24",
             feature = "winit-23",
             feature = "winit-22",
@@ -485,7 +506,8 @@ impl WinitPlatform {
         feature = "winit-20",
         feature = "winit-22",
         feature = "winit-23",
-        feature = "winit-24"
+        feature = "winit-24",
+        feature = "winit-25",
     ))]
     pub fn attach_window(&mut self, io: &mut Io, window: &Window, hidpi_mode: HiDpiMode) {
         let (hidpi_mode, hidpi_factor) = hidpi_mode.apply(window.scale_factor());
@@ -508,6 +530,7 @@ impl WinitPlatform {
     /// your application to use the same logical coordinates as imgui-rs.
     #[cfg(all(
         not(any(
+            feature = "winit-25",
             feature = "winit-24",
             feature = "winit-23",
             feature = "winit-22",
@@ -531,7 +554,8 @@ impl WinitPlatform {
         feature = "winit-20",
         feature = "winit-22",
         feature = "winit-23",
-        feature = "winit-24"
+        feature = "winit-24",
+        feature = "winit-25"
     ))]
     pub fn scale_size_from_winit(
         &self,
@@ -551,6 +575,7 @@ impl WinitPlatform {
     /// your application to use the same logical coordinates as imgui-rs.
     #[cfg(all(
         not(any(
+            feature = "winit-25",
             feature = "winit-24",
             feature = "winit-23",
             feature = "winit-22",
@@ -578,7 +603,8 @@ impl WinitPlatform {
         feature = "winit-20",
         feature = "winit-22",
         feature = "winit-23",
-        feature = "winit-24"
+        feature = "winit-24",
+        feature = "winit-25"
     ))]
     pub fn scale_pos_from_winit(
         &self,
@@ -598,6 +624,7 @@ impl WinitPlatform {
     /// your application to use the same logical coordinates as imgui-rs.
     #[cfg(all(
         not(any(
+            feature = "winit-25",
             feature = "winit-24",
             feature = "winit-23",
             feature = "winit-22",
@@ -625,7 +652,8 @@ impl WinitPlatform {
         feature = "winit-20",
         feature = "winit-22",
         feature = "winit-23",
-        feature = "winit-24"
+        feature = "winit-24",
+        feature = "winit-25"
     ))]
     pub fn scale_pos_for_winit(
         &self,
@@ -648,6 +676,7 @@ impl WinitPlatform {
     /// * mouse state is updated
     #[cfg(all(
         not(any(
+            feature = "winit-25",
             feature = "winit-24",
             feature = "winit-23",
             feature = "winit-22",
@@ -694,7 +723,12 @@ impl WinitPlatform {
     /// * keyboard state is updated
     /// * mouse state is updated
     #[cfg(all(
-        not(any(feature = "winit-24", feature = "winit-23", feature = "winit-22")),
+        not(any(
+            feature = "winit-25",
+            feature = "winit-24",
+            feature = "winit-23",
+            feature = "winit-22"
+        )),
         feature = "winit-20",
     ))]
     pub fn handle_event<T>(&mut self, io: &mut Io, window: &Window, event: &Event<T>) {
@@ -741,7 +775,12 @@ impl WinitPlatform {
     /// * window size / dpi factor changes are applied
     /// * keyboard state is updated
     /// * mouse state is updated
-    #[cfg(any(feature = "winit-22", feature = "winit-23", feature = "winit-24"))]
+    #[cfg(any(
+        feature = "winit-22",
+        feature = "winit-23",
+        feature = "winit-24",
+        feature = "winit-25"
+    ))]
     pub fn handle_event<T>(&mut self, io: &mut Io, window: &Window, event: &Event<T>) {
         match *event {
             Event::WindowEvent {
@@ -778,6 +817,7 @@ impl WinitPlatform {
     }
     #[cfg(all(
         not(any(
+            feature = "winit-25",
             feature = "winit-24",
             feature = "winit-23",
             feature = "winit-22",
@@ -873,7 +913,7 @@ impl WinitPlatform {
         }
     }
     #[cfg(all(
-        not(any(feature = "winit-23", feature = "winit-24")),
+        not(any(feature = "winit-23", feature = "winit-24", feature = "winit-25")),
         any(feature = "winit-20", feature = "winit-22")
     ))]
     fn handle_window_event(&mut self, io: &mut Io, window: &Window, event: &WindowEvent) {
@@ -978,7 +1018,7 @@ impl WinitPlatform {
         }
     }
 
-    #[cfg(any(feature = "winit-23", feature = "winit-24"))]
+    #[cfg(any(feature = "winit-23", feature = "winit-24", feature = "winit-25"))]
     fn handle_window_event(&mut self, io: &mut Io, window: &Window, event: &WindowEvent) {
         match *event {
             WindowEvent::Resized(physical_size) => {
@@ -1089,6 +1129,7 @@ impl WinitPlatform {
     /// * mouse cursor is repositioned (if requested by imgui-rs)
     #[cfg(all(
         not(any(
+            feature = "winit-25",
             feature = "winit-24",
             feature = "winit-23",
             feature = "winit-22",
@@ -1118,7 +1159,8 @@ impl WinitPlatform {
         feature = "winit-20",
         feature = "winit-22",
         feature = "winit-23",
-        feature = "winit-24"
+        feature = "winit-24",
+        feature = "winit-25"
     ))]
     pub fn prepare_frame(&self, io: &mut Io, window: &Window) -> Result<(), ExternalError> {
         self.copy_mouse_to_io(&mut io.mouse_down);

From e964dceebb588a9615e1dac1c899e461a60de2f8 Mon Sep 17 00:00:00 2001
From: Johan Andersson <repi@repi.se>
Date: Sun, 23 May 2021 00:06:37 +0200
Subject: [PATCH 2/6] Use winit 0.24 for examples due to glutin

---
 imgui-gfx-examples/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/imgui-gfx-examples/Cargo.toml b/imgui-gfx-examples/Cargo.toml
index c92c2383f..76e49080a 100644
--- a/imgui-gfx-examples/Cargo.toml
+++ b/imgui-gfx-examples/Cargo.toml
@@ -22,7 +22,7 @@ glutin = "0.26"
 image = "0.23"
 imgui = { path = "../imgui" }
 imgui-gfx-renderer = { path = "../imgui-gfx-renderer" }
-imgui-winit-support = { path = "../imgui-winit-support" }
+imgui-winit-support = { path = "../imgui-winit-support", default-features = false, features = ["winit-24"] } # glutin still depends on winit 0.24
 old_school_gfx_glutin_ext = "0.26"
 
 [target.'cfg(windows)'.dev-dependencies]

From 4569524686fe4fdd70f53282ec35750d569cae5a Mon Sep 17 00:00:00 2001
From: Johan Andersson <repi@repi.se>
Date: Sun, 23 May 2021 00:26:24 +0200
Subject: [PATCH 3/6] Switch back to winit 0.24 as default

---
 imgui-winit-support/Cargo.toml |  2 +-
 imgui-winit-support/src/lib.rs | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/imgui-winit-support/Cargo.toml b/imgui-winit-support/Cargo.toml
index 92e5a1e10..f60c32c90 100644
--- a/imgui-winit-support/Cargo.toml
+++ b/imgui-winit-support/Cargo.toml
@@ -19,7 +19,7 @@ winit-24 = { version = "0.24", package = "winit", optional = true }
 winit-25 = { version = "0.25", package = "winit", optional = true }
 
 [features]
-default = ["winit-25"]
+default = ["winit-24"] # TODO: Change to winit-25 when glutin has upgraded to it
 
 # This is phrased as a negative (unlike most features) so that it needs to be
 # explicitly disabled (and `default-features = false` won't do it). To avoid
diff --git a/imgui-winit-support/src/lib.rs b/imgui-winit-support/src/lib.rs
index 5930b3527..34745634b 100644
--- a/imgui-winit-support/src/lib.rs
+++ b/imgui-winit-support/src/lib.rs
@@ -79,10 +79,10 @@
 //!
 //! The following versions are supported, controlled by the listed feature.
 //!
-//! - The `winit-25` feature supports winit versions `0.25`. This is
+//! - The `winit-25` feature uses winit versions compatible with `0.25`.
+//! - The `winit-24` feature supports winit versions `0.24`. This is
 //!   on by default, so to use any other version you need to disable this crates
 //!   default features.
-//! - The `winit-24` feature uses winit versions compatible with `0.24`.
 //! - The `winit-23` feature uses winit versions compatible with `0.23`.
 //! - The `winit-22` feature uses winit versions compatible with `0.22`.
 //! - The `winit-20` feature should support winit either `0.20` or winit `0.21`.
@@ -258,8 +258,8 @@ fn check_multiple_winits() {
         (this likely indicates misconfiguration, see documentation for details)."
     );
     let feats = [
-        ("winit-25", cfg!(feature = "winit-25"), " (default)"),
-        ("winit-24", cfg!(feature = "winit-24"), ""),
+        ("winit-25", cfg!(feature = "winit-25"), ""),
+        ("winit-24", cfg!(feature = "winit-24"), " (default)"),
         ("winit-23", cfg!(feature = "winit-23"), ""),
         ("winit-22", cfg!(feature = "winit-22"), ""),
         ("winit-20", cfg!(feature = "winit-20"), ""),
@@ -270,7 +270,7 @@ fn check_multiple_winits() {
             let _ = writeln!(err, "    `feature = {:?}` is enabled{}", name, extra);
         }
     }
-    if cfg!(feature = "winit-25") && winits_enabled == 2 {
+    if cfg!(feature = "winit-24") && winits_enabled == 2 {
         let _ = writeln!(
             err,
             "    Perhaps you are missing a `default-features = false`?",

From 92bed9370a32b12c8a35dc6719432b0a3519a53f Mon Sep 17 00:00:00 2001
From: Johan Andersson <repi@repi.se>
Date: Sun, 23 May 2021 01:39:30 +0200
Subject: [PATCH 4/6] Only use single winit version

---
 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 34745634b..8243862cd 100644
--- a/imgui-winit-support/src/lib.rs
+++ b/imgui-winit-support/src/lib.rs
@@ -133,7 +133,7 @@
 //! - Changing the default feature to the new latest `winit` version is *not* a
 //!   breaking change.
 
-#[cfg(feature = "winit-25")]
+#[cfg(all(not(feature = "winit-24"), feature = "winit-25"))]
 use winit_25 as winit;
 
 #[cfg(feature = "winit-24")]

From d82c9a0d8868457b3a0d659c0e9de8dd80c9f197 Mon Sep 17 00:00:00 2001
From: Johan Andersson <repi@repi.se>
Date: Sun, 23 May 2021 02:08:55 +0200
Subject: [PATCH 5/6] Make winit 0.25 default again

---
 imgui-winit-support/Cargo.toml | 2 +-
 imgui-winit-support/src/lib.rs | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/imgui-winit-support/Cargo.toml b/imgui-winit-support/Cargo.toml
index f60c32c90..16254e70a 100644
--- a/imgui-winit-support/Cargo.toml
+++ b/imgui-winit-support/Cargo.toml
@@ -19,7 +19,7 @@ winit-24 = { version = "0.24", package = "winit", optional = true }
 winit-25 = { version = "0.25", package = "winit", optional = true }
 
 [features]
-default = ["winit-24"] # TODO: Change to winit-25 when glutin has upgraded to it
+default = ["winit-25"] 
 
 # This is phrased as a negative (unlike most features) so that it needs to be
 # explicitly disabled (and `default-features = false` won't do it). To avoid
diff --git a/imgui-winit-support/src/lib.rs b/imgui-winit-support/src/lib.rs
index 8243862cd..b816e6c19 100644
--- a/imgui-winit-support/src/lib.rs
+++ b/imgui-winit-support/src/lib.rs
@@ -79,10 +79,10 @@
 //!
 //! The following versions are supported, controlled by the listed feature.
 //!
-//! - The `winit-25` feature uses winit versions compatible with `0.25`.
-//! - The `winit-24` feature supports winit versions `0.24`. This is
+//! - The `winit-25` feature supports winit versions `0.25`. This is
 //!   on by default, so to use any other version you need to disable this crates
 //!   default features.
+//! - The `winit-24` feature uses winit versions compatible with `0.24`.
 //! - The `winit-23` feature uses winit versions compatible with `0.23`.
 //! - The `winit-22` feature uses winit versions compatible with `0.22`.
 //! - The `winit-20` feature should support winit either `0.20` or winit `0.21`.
@@ -133,10 +133,10 @@
 //! - Changing the default feature to the new latest `winit` version is *not* a
 //!   breaking change.
 
-#[cfg(all(not(feature = "winit-24"), feature = "winit-25"))]
+#[cfg(feature = "winit-25")]
 use winit_25 as winit;
 
-#[cfg(feature = "winit-24")]
+#[cfg(all(not(feature = "winit-25"), feature = "winit-24"))]
 use winit_24 as winit;
 
 #[cfg(all(

From 686346177eed9d8211f5b41ae3fb819c5537b143 Mon Sep 17 00:00:00 2001
From: Johan Andersson <repi@repi.se>
Date: Sun, 23 May 2021 02:15:40 +0200
Subject: [PATCH 6/6] Revert "Make winit 0.25 default again"

This reverts commit d82c9a0d8868457b3a0d659c0e9de8dd80c9f197.
---
 imgui-winit-support/Cargo.toml | 2 +-
 imgui-winit-support/src/lib.rs | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/imgui-winit-support/Cargo.toml b/imgui-winit-support/Cargo.toml
index 16254e70a..f60c32c90 100644
--- a/imgui-winit-support/Cargo.toml
+++ b/imgui-winit-support/Cargo.toml
@@ -19,7 +19,7 @@ winit-24 = { version = "0.24", package = "winit", optional = true }
 winit-25 = { version = "0.25", package = "winit", optional = true }
 
 [features]
-default = ["winit-25"] 
+default = ["winit-24"] # TODO: Change to winit-25 when glutin has upgraded to it
 
 # This is phrased as a negative (unlike most features) so that it needs to be
 # explicitly disabled (and `default-features = false` won't do it). To avoid
diff --git a/imgui-winit-support/src/lib.rs b/imgui-winit-support/src/lib.rs
index b816e6c19..8243862cd 100644
--- a/imgui-winit-support/src/lib.rs
+++ b/imgui-winit-support/src/lib.rs
@@ -79,10 +79,10 @@
 //!
 //! The following versions are supported, controlled by the listed feature.
 //!
-//! - The `winit-25` feature supports winit versions `0.25`. This is
+//! - The `winit-25` feature uses winit versions compatible with `0.25`.
+//! - The `winit-24` feature supports winit versions `0.24`. This is
 //!   on by default, so to use any other version you need to disable this crates
 //!   default features.
-//! - The `winit-24` feature uses winit versions compatible with `0.24`.
 //! - The `winit-23` feature uses winit versions compatible with `0.23`.
 //! - The `winit-22` feature uses winit versions compatible with `0.22`.
 //! - The `winit-20` feature should support winit either `0.20` or winit `0.21`.
@@ -133,10 +133,10 @@
 //! - Changing the default feature to the new latest `winit` version is *not* a
 //!   breaking change.
 
-#[cfg(feature = "winit-25")]
+#[cfg(all(not(feature = "winit-24"), feature = "winit-25"))]
 use winit_25 as winit;
 
-#[cfg(all(not(feature = "winit-25"), feature = "winit-24"))]
+#[cfg(feature = "winit-24")]
 use winit_24 as winit;
 
 #[cfg(all(