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

Fix ImGuiIO struct layout problems

Browse Source 
ImGuiNavInput::COUNT doesn't include the internal enum values, so
the struct layout of ImGuiIO was wrong
This commit is contained in:
Joonas Javanainen 2018-10-18 17:52:13 +03:00
parent 8bf6831f5f
commit 1750aa5e72
No known key found for this signature in database
GPG Key ID: D39CCA5CB19B9179
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
imgui-sys/src/enums.rs
View File

@ -370,6 +370,7 @@ impl ImGuiNavInput {
ImGuiNavInput::TweakFast, ImGuiNavInput::TweakFast,
]; ];
pub const COUNT: usize = 16; pub const COUNT: usize = 16;
pub(crate) const COUNT_INTERNAL: usize = 21;
} }
/// A variable identifier for styling /// A variable identifier for styling

8
imgui-sys/src/structs.rs
View File

@ -257,12 +257,12 @@ pub struct ImGuiIO {
pub key_super: bool, pub key_super: bool,
pub keys_down: [bool; 512], pub keys_down: [bool; 512],
pub input_characters: [ImWchar; 16 + 1], pub input_characters: [ImWchar; 16 + 1],
pub nav_inputs: [c_float; ImGuiNavInput::COUNT], pub nav_inputs: [c_float; ImGuiNavInput::COUNT_INTERNAL],
pub want_capture_mouse: bool, pub want_capture_mouse: bool,
pub want_capture_keyboard: bool, pub want_capture_keyboard: bool,
pub want_text_input: bool, pub want_text_input: bool,
pub want_move_mouse: bool, pub want_set_mouse_pos: bool,
pub want_save_ini_settings: bool, pub want_save_ini_settings: bool,
pub nav_active: bool, pub nav_active: bool,
pub nav_visible: bool, pub nav_visible: bool,
@ -287,8 +287,8 @@ pub struct ImGuiIO {
mouse_drag_max_distance_sqr: [c_float; 5], mouse_drag_max_distance_sqr: [c_float; 5],
keys_down_duration: [c_float; 512], keys_down_duration: [c_float; 512],
keys_down_duration_prev: [c_float; 512], keys_down_duration_prev: [c_float; 512],
nav_inputs_down_duration: [c_float; ImGuiNavInput::COUNT], nav_inputs_down_duration: [c_float; ImGuiNavInput::COUNT_INTERNAL],
nav_inputs_down_duration_prev: [c_float; ImGuiNavInput::COUNT], nav_inputs_down_duration_prev: [c_float; ImGuiNavInput::COUNT_INTERNAL],
} }
/// Helper to manually clip large list of items /// Helper to manually clip large list of items