From 561299ca8eaf6ac7320916fdb6c577642c2a6a42 Mon Sep 17 00:00:00 2001 From: Jonathan Spira Date: Tue, 1 Oct 2024 10:23:56 -0400 Subject: [PATCH 1/2] fixed examples --- examples/keyboard.rs | 8 -------- examples/test_window_impl.rs | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/examples/keyboard.rs b/examples/keyboard.rs index a645e41..7266420 100644 --- a/examples/keyboard.rs +++ b/examples/keyboard.rs @@ -119,14 +119,6 @@ fn main() { home_counter += 1; } ui.text(format!("Home has been pressed for {} frames", home_counter)); - // It is important to remember that unlike using - // `imgui::Key`, there is nothing enforcing the index - // is the key you expect. For example if you hardcode - // your key ID's and switch backends, you may be - // querying different keys! - if ui.io().keys_down[123] { - // A mystery key is down! - } // It is also possible to use the `is_key_...` methods // with arbitrary key indexes. For example, to check diff --git a/examples/test_window_impl.rs b/examples/test_window_impl.rs index 0a7e6e4..cb43519 100644 --- a/examples/test_window_impl.rs +++ b/examples/test_window_impl.rs @@ -914,7 +914,7 @@ fn show_example_menu_file(ui: &Ui, state: &mut FileMenuState) { ui.child_window("child") .size([0.0, 60.0]) - .border(true) + .child_flags(ChildFlags::BORDERS) .build(|| { for i in 0..10 { ui.text(format!("Scrolling Text {}", i)); From 46aae9a6e5bb759d8edcfcccfc4fad3131b83b9d Mon Sep 17 00:00:00 2001 From: Jonathan Spira Date: Wed, 2 Oct 2024 18:51:33 -0400 Subject: [PATCH 2/2] bumping git version --- Cargo.lock | 12 ++++-------- Cargo.toml | 13 +++++-------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 83265f0..b0987e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -647,8 +647,7 @@ dependencies = [ [[package]] name = "imgui" version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8addafa5cecf0515812226e806913814e02ce38d10215778082af5174abe5669" +source = "git+https://github.com/imgui-rs/imgui-rs#cf3c01bf0fecfdaffd5636e77393afb3725d62c6" dependencies = [ "bitflags 1.3.2", "cfg-if", @@ -672,8 +671,7 @@ dependencies = [ [[package]] name = "imgui-glium-renderer" version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "781e53a393214a132c89c62e6e4b817645ad38832d3e334b2ad543f2c3df5106" +source = "git+https://github.com/imgui-rs/imgui-glium-renderer#3b7ac1396a4319ee2937a6b5e8a4eebabd773e2b" dependencies = [ "glium", "imgui", @@ -682,8 +680,7 @@ dependencies = [ [[package]] name = "imgui-sys" version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ead193f9f4b60398e8b8f4ab1483e2321640d87aeebdaa3e5f44c55633ccd804" +source = "git+https://github.com/imgui-rs/imgui-rs#cf3c01bf0fecfdaffd5636e77393afb3725d62c6" dependencies = [ "cc", "cfg-if", @@ -694,8 +691,7 @@ dependencies = [ [[package]] name = "imgui-winit-support" version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff7fcccfa9efab56c94274c0fec9939bb14149342b49e6a425883a5b7dda6a3f" +source = "git+https://github.com/imgui-rs/imgui-winit-support#cee1682eade974375d38b4546ec2a7cf5e721bff" dependencies = [ "imgui", "winit", diff --git a/Cargo.toml b/Cargo.toml index 6e7d8d7..8ff0129 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,11 +13,8 @@ copypasta = "0.8" glium = { version = "0.35.0", default-features = true } image = "0.23" -imgui = { version = "0.12", features = ["tables-api"] } -imgui-glium-renderer = "0.13.0" -imgui-winit-support = "0.13.0" - -# Since the examples aren't included, it's very convenient to -# make a patch here to test various things -# [patch.crates-io] -# imgui = { path = "path/to/local/imgui/here" } \ No newline at end of file +imgui-glium-renderer = { version = "0.13.0", git = "https://github.com/imgui-rs/imgui-glium-renderer" } +imgui = { git = "https://github.com/imgui-rs/imgui-rs", version = "0.12", features = [ + "tables-api", +] } +imgui-winit-support = { version = "0.13", git = "https://github.com/imgui-rs/imgui-winit-support" } \ No newline at end of file