elias/imgui-rs
1
0
Fork 0
mirror of https://github.com/eliasstepanik/imgui-rs.git synced 2026-01-22 02:48:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix up Io fields for imgui 1.86

Browse Source 
A few things in the "docking" were actually just post-1.84 changes which were present in the docking branch
This commit is contained in:
dbr 2022-01-11 18:10:52 +11:00
parent dac88186a1
commit d52177dc6c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
imgui/src/io.rs
View File

@ -314,7 +314,6 @@ pub struct Io {
/// f32::MAX]), so a disappearing/reappearing mouse won't have a huge delta. /// f32::MAX]), so a disappearing/reappearing mouse won't have a huge delta.
pub mouse_delta: [f32; 2], pub mouse_delta: [f32; 2],
#[cfg(feature = "docking")]
pub want_capture_mouse_unless_popup_close: bool, pub want_capture_mouse_unless_popup_close: bool,
key_mods: sys::ImGuiKeyModFlags, key_mods: sys::ImGuiKeyModFlags,
@ -324,11 +323,11 @@ pub struct Io {
mouse_clicked_time: [f64; 5], mouse_clicked_time: [f64; 5],
mouse_clicked: [bool; 5], mouse_clicked: [bool; 5],
mouse_double_clicked: [bool; 5], mouse_double_clicked: [bool; 5],
mouse_clicked_count: [u16; 5],
mouse_clicked_last_count: [u16; 5],
mouse_released: [bool; 5], mouse_released: [bool; 5],
mouse_down_owned: [bool; 5], mouse_down_owned: [bool; 5],
#[cfg(feature = "docking")]
mouse_down_owned_unless_popup_close: [bool; 5], mouse_down_owned_unless_popup_close: [bool; 5],
mouse_down_was_double_click: [bool; 5],
mouse_down_duration: [f32; 5], mouse_down_duration: [f32; 5],
mouse_down_duration_prev: [f32; 5], mouse_down_duration_prev: [f32; 5],
mouse_drag_max_distance_abs: [[f32; 2]; 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: [f32; NavInput::COUNT + NavInput::INTERNAL_COUNT],
nav_inputs_down_duration_prev: [f32; NavInput::COUNT + NavInput::INTERNAL_COUNT], nav_inputs_down_duration_prev: [f32; NavInput::COUNT + NavInput::INTERNAL_COUNT],
pen_pressure: f32, pen_pressure: f32,
#[cfg(feature = "docking")]
app_focus_lost: bool, app_focus_lost: bool,
input_queue_surrogate: sys::ImWchar16, input_queue_surrogate: sys::ImWchar16,
input_queue_characters: ImVector<sys::ImWchar>, 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_time, MouseClickedTime);
assert_field_offset!(mouse_clicked, MouseClicked); assert_field_offset!(mouse_clicked, MouseClicked);
assert_field_offset!(mouse_double_clicked, MouseDoubleClicked); 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_released, MouseReleased);
assert_field_offset!(mouse_down_owned, MouseDownOwned); 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, MouseDownDuration);
assert_field_offset!(mouse_down_duration_prev, MouseDownDurationPrev); assert_field_offset!(mouse_down_duration_prev, MouseDownDurationPrev);
assert_field_offset!(mouse_drag_max_distance_abs, MouseDragMaxDistanceAbs); assert_field_offset!(mouse_drag_max_distance_abs, MouseDragMaxDistanceAbs);