From d52177dc6c8175beb3bf80aedcbc26015d7fdf89 Mon Sep 17 00:00:00 2001
From: dbr <dbr.onix@gmail.com>
Date: Tue, 11 Jan 2022 18:10:52 +1100
Subject: [PATCH] Fix up Io fields for imgui 1.86

A few things in the "docking" were actually just post-1.84 changes which were present in the docking branch
---
 imgui/src/io.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/imgui/src/io.rs b/imgui/src/io.rs
index 1e31a84..46f9af4 100644
--- a/imgui/src/io.rs
+++ b/imgui/src/io.rs
@@ -314,7 +314,6 @@ pub struct Io {
     /// f32::MAX]), so a disappearing/reappearing mouse won't have a huge delta.
     pub mouse_delta: [f32; 2],
 
-    #[cfg(feature = "docking")]
     pub want_capture_mouse_unless_popup_close: bool,
 
     key_mods: sys::ImGuiKeyModFlags,
@@ -324,11 +323,11 @@ pub struct Io {
     mouse_clicked_time: [f64; 5],
     mouse_clicked: [bool; 5],
     mouse_double_clicked: [bool; 5],
+    mouse_clicked_count: [u16; 5],
+    mouse_clicked_last_count: [u16; 5],
     mouse_released: [bool; 5],
     mouse_down_owned: [bool; 5],
-    #[cfg(feature = "docking")]
     mouse_down_owned_unless_popup_close: [bool; 5],
-    mouse_down_was_double_click: [bool; 5],
     mouse_down_duration: [f32; 5],
     mouse_down_duration_prev: [f32; 5],
     mouse_drag_max_distance_abs: [[f32; 2]; 5],
@@ -338,7 +337,6 @@ pub struct Io {
     nav_inputs_down_duration: [f32; NavInput::COUNT + NavInput::INTERNAL_COUNT],
     nav_inputs_down_duration_prev: [f32; NavInput::COUNT + NavInput::INTERNAL_COUNT],
     pen_pressure: f32,
-    #[cfg(feature = "docking")]
     app_focus_lost: bool,
     input_queue_surrogate: sys::ImWchar16,
     input_queue_characters: ImVector<sys::ImWchar>,
@@ -516,9 +514,10 @@ fn test_io_memory_layout() {
     assert_field_offset!(mouse_clicked_time, MouseClickedTime);
     assert_field_offset!(mouse_clicked, MouseClicked);
     assert_field_offset!(mouse_double_clicked, MouseDoubleClicked);
+    assert_field_offset!(mouse_clicked_count, MouseClickedCount);
+    assert_field_offset!(mouse_clicked_last_count, MouseClickedLastCount);
     assert_field_offset!(mouse_released, MouseReleased);
     assert_field_offset!(mouse_down_owned, MouseDownOwned);
-    assert_field_offset!(mouse_down_was_double_click, MouseDownWasDoubleClick);
     assert_field_offset!(mouse_down_duration, MouseDownDuration);
     assert_field_offset!(mouse_down_duration_prev, MouseDownDurationPrev);
     assert_field_offset!(mouse_drag_max_distance_abs, MouseDragMaxDistanceAbs);