From 0a918d3d0c70b873503afa03c8977d725a7145f4 Mon Sep 17 00:00:00 2001 From: Jonathan Spira Date: Wed, 2 Oct 2024 18:43:39 -0400 Subject: [PATCH] bumping git dep --- Cargo.toml | 2 +- examples/sdl2_01_basic.rs | 2 +- src/lib.rs | 24 ++++++++---------------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b5dd6e9..f65ba0e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,5 +15,5 @@ imgui = { version = "0.12.0", git = "https://github.com/imgui-rs/imgui-rs" } sdl2 = "0.37" [dev-dependencies] -imgui-glow-renderer = "0.12.0" +imgui-glow-renderer = { version = "0.13.0", git = "https://github.com/imgui-rs/imgui-glow-renderer" } sdl2 = { version = "0.37", features = ["bundled", "static-link"] } \ No newline at end of file diff --git a/examples/sdl2_01_basic.rs b/examples/sdl2_01_basic.rs index a3de142..f91f39d 100644 --- a/examples/sdl2_01_basic.rs +++ b/examples/sdl2_01_basic.rs @@ -61,7 +61,7 @@ fn main() { /* create platform and renderer */ let mut platform = SdlPlatform::new(&mut imgui); - let mut renderer = AutoRenderer::initialize(gl, &mut imgui).unwrap(); + let mut renderer = AutoRenderer::new(gl, &mut imgui).unwrap(); /* start main loop */ let mut event_pump = sdl.event_pump().unwrap(); diff --git a/src/lib.rs b/src/lib.rs index c06254c..03dbad7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -350,22 +350,14 @@ fn handle_key(io: &mut Io, key: &Scancode, pressed: bool) { /// Handle changes in the key modifier states. fn handle_key_modifier(io: &mut Io, keymod: &Mod) { - io.add_key_event( - imgui::Key::ModShift, - keymod.intersects(Mod::LSHIFTMOD | Mod::RSHIFTMOD), - ); - io.add_key_event( - imgui::Key::ModCtrl, - keymod.intersects(Mod::LCTRLMOD | Mod::RCTRLMOD), - ); - io.add_key_event( - imgui::Key::ModAlt, - keymod.intersects(Mod::LALTMOD | Mod::RALTMOD), - ); - io.add_key_event( - imgui::Key::ModSuper, - keymod.intersects(Mod::LGUIMOD | Mod::RGUIMOD), - ); + io.add_key_event(imgui::Key::LeftShift, keymod.intersects(Mod::LSHIFTMOD)); + io.add_key_event(imgui::Key::RightShift, keymod.intersects(Mod::RSHIFTMOD)); + io.add_key_event(imgui::Key::LeftCtrl, keymod.intersects(Mod::LCTRLMOD)); + io.add_key_event(imgui::Key::RightCtrl, keymod.intersects(Mod::RCTRLMOD)); + io.add_key_event(imgui::Key::LeftAlt, keymod.intersects(Mod::LALTMOD)); + io.add_key_event(imgui::Key::RightAlt, keymod.intersects(Mod::RALTMOD)); + io.add_key_event(imgui::Key::LeftSuper, keymod.intersects(Mod::LGUIMOD)); + io.add_key_event(imgui::Key::RightSuper, keymod.intersects(Mod::RGUIMOD)); } /// Map an imgui::MouseCursor to an equivalent sdl2::mouse::SystemCursor.