From ff2ddf00df4824d622542f407f69cdd317f4f321 Mon Sep 17 00:00:00 2001 From: Joonas Javanainen Date: Tue, 18 Aug 2015 00:07:53 +0300 Subject: [PATCH] Separate impl block for sdl2 --- src/lib.rs | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 3422c5a..d8ce457 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -57,20 +57,6 @@ impl ImGui { let io: &mut ffi::ImGuiIO = unsafe { mem::transmute(ffi::igGetIO()) }; io.mouse_draw_cursor = value; } - #[cfg(feature = "sdl2")] - pub fn update_mouse(&mut self, mouse: &::sdl2::mouse::MouseUtil) { - let (mouse_state, mouse_x, mouse_y) = mouse.get_mouse_state(); - let io: &mut ffi::ImGuiIO = unsafe { mem::transmute(ffi::igGetIO()) }; - io.mouse_pos.x = mouse_x as f32; - io.mouse_pos.y = mouse_y as f32; - io.mouse_down = [ - mouse_state.left(), - mouse_state.right(), - mouse_state.middle(), - mouse_state.x1(), - mouse_state.x2() - ]; - } pub fn set_mouse_pos(&mut self, x: f32, y: f32) { let io: &mut ffi::ImGuiIO = unsafe { mem::transmute(ffi::igGetIO()) }; io.mouse_pos.x = x; @@ -103,6 +89,23 @@ impl Drop for ImGui { } } +#[cfg(feature = "sdl2")] +impl ImGui { + pub fn update_mouse(&mut self, mouse: &::sdl2::mouse::MouseUtil) { + let (mouse_state, mouse_x, mouse_y) = mouse.get_mouse_state(); + let io: &mut ffi::ImGuiIO = unsafe { mem::transmute(ffi::igGetIO()) }; + io.mouse_pos.x = mouse_x as f32; + io.mouse_pos.y = mouse_y as f32; + io.mouse_down = [ + mouse_state.left(), + mouse_state.right(), + mouse_state.middle(), + mouse_state.x1(), + mouse_state.x2() + ]; + } +} + pub struct DrawList<'a> { pub cmd_buffer: &'a [ffi::ImDrawCmd], pub idx_buffer: &'a [ffi::ImDrawIdx],