Skip to content

Commit 1a2f700

Browse files
authored
Merge pull request #1 from imgui-rs/0.14-imgui
fixed examples
2 parents 7cef212 + 46aae9a commit 1a2f700

File tree

4 files changed

+10
-25
lines changed

4 files changed

+10
-25
lines changed

Cargo.lock

Lines changed: 4 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@ copypasta = "0.8"
1313
glium = { version = "0.35.0", default-features = true }
1414
image = "0.23"
1515

16-
imgui = { version = "0.12", features = ["tables-api"] }
17-
imgui-glium-renderer = "0.13.0"
18-
imgui-winit-support = "0.13.0"
19-
20-
# Since the examples aren't included, it's very convenient to
21-
# make a patch here to test various things
22-
# [patch.crates-io]
23-
# imgui = { path = "path/to/local/imgui/here" }
16+
imgui-glium-renderer = { version = "0.13.0", git = "https://github.com/imgui-rs/imgui-glium-renderer" }
17+
imgui = { git = "https://github.com/imgui-rs/imgui-rs", version = "0.12", features = [
18+
"tables-api",
19+
] }
20+
imgui-winit-support = { version = "0.13", git = "https://github.com/imgui-rs/imgui-winit-support" }

examples/keyboard.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,6 @@ fn main() {
119119
home_counter += 1;
120120
}
121121
ui.text(format!("Home has been pressed for {} frames", home_counter));
122-
// It is important to remember that unlike using
123-
// `imgui::Key`, there is nothing enforcing the index
124-
// is the key you expect. For example if you hardcode
125-
// your key ID's and switch backends, you may be
126-
// querying different keys!
127-
if ui.io().keys_down[123] {
128-
// A mystery key is down!
129-
}
130122

131123
// It is also possible to use the `is_key_...` methods
132124
// with arbitrary key indexes. For example, to check

examples/test_window_impl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ fn show_example_menu_file(ui: &Ui, state: &mut FileMenuState) {
914914

915915
ui.child_window("child")
916916
.size([0.0, 60.0])
917-
.border(true)
917+
.child_flags(ChildFlags::BORDERS)
918918
.build(|| {
919919
for i in 0..10 {
920920
ui.text(format!("Scrolling Text {}", i));

0 commit comments

Comments
 (0)