From b30cb740ba8b422d19cbc753f1aa42983008a80b Mon Sep 17 00:00:00 2001 From: Jack Mac Date: Sun, 26 Sep 2021 21:15:02 -0400 Subject: [PATCH] aaaand fixed up the examples --- imgui-examples/examples/support/mod.rs | 2 +- imgui-examples/examples/test_window_impl.rs | 6 +++--- imgui-glow-renderer/examples/01_basic.rs | 4 ++-- imgui-glow-renderer/examples/02_triangle.rs | 2 +- imgui-glow-renderer/examples/03_triangle_gles.rs | 2 +- imgui-glow-renderer/examples/04_custom_textures.rs | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/imgui-examples/examples/support/mod.rs b/imgui-examples/examples/support/mod.rs index 2a5c9d5..0b2dcbc 100644 --- a/imgui-examples/examples/support/mod.rs +++ b/imgui-examples/examples/support/mod.rs @@ -121,7 +121,7 @@ impl System { let mut target = display.draw(); target.clear_color_srgb(1.0, 1.0, 1.0, 1.0); platform.prepare_render(&ui, gl_window.window()); - let draw_data = ui.render(); + let draw_data = imgui.render(); renderer .render(&mut target, draw_data) .expect("Rendering failed"); diff --git a/imgui-examples/examples/test_window_impl.rs b/imgui-examples/examples/test_window_impl.rs index a43e95b..f62eaa0 100644 --- a/imgui-examples/examples/test_window_impl.rs +++ b/imgui-examples/examples/test_window_impl.rs @@ -330,7 +330,7 @@ fn show_test_window(ui: &Ui, state: &mut State, opened: &mut bool) { window = window.opened(opened) } window.build(|| { - ui.push_item_width(-140.0); + let _w = ui.push_item_width(-140.0); ui.text(format!("dear imgui says hello. ({})", imgui::dear_imgui_version())); if let Some(menu_bar) = ui.begin_menu_bar() { if let Some(menu) = ui.begin_menu("Menu") { @@ -827,7 +827,7 @@ CTRL+click on individual component to input value.\n", }); } -fn show_example_app_main_menu_bar<'a>(ui: &Ui<'a>, state: &mut State) { +fn show_example_app_main_menu_bar(ui: &Ui, state: &mut State) { if let Some(menu_bar) = ui.begin_main_menu_bar() { if let Some(menu) = ui.begin_menu("File") { show_example_menu_file(ui, &mut state.file_menu); @@ -849,7 +849,7 @@ fn show_example_app_main_menu_bar<'a>(ui: &Ui<'a>, state: &mut State) { } } -fn show_example_menu_file<'a>(ui: &Ui<'a>, state: &mut FileMenuState) { +fn show_example_menu_file(ui: &Ui, state: &mut FileMenuState) { MenuItem::new("(dummy menu)").enabled(false).build(ui); MenuItem::new("New").build(ui); MenuItem::new("Open").shortcut("Ctrl+O").build(ui); diff --git a/imgui-glow-renderer/examples/01_basic.rs b/imgui-glow-renderer/examples/01_basic.rs index 0ca9091..ffdd4c6 100644 --- a/imgui-glow-renderer/examples/01_basic.rs +++ b/imgui-glow-renderer/examples/01_basic.rs @@ -51,8 +51,8 @@ fn main() { let ui = imgui_context.frame(); ui.show_demo_window(&mut true); - winit_platform.prepare_render(&ui, window.window()); - let draw_data = ui.render(); + winit_platform.prepare_render(ui, window.window()); + let draw_data = imgui_context.render(); // This is the only extra render step to add ig_renderer diff --git a/imgui-glow-renderer/examples/02_triangle.rs b/imgui-glow-renderer/examples/02_triangle.rs index 55a2b4a..6bc6c1c 100644 --- a/imgui-glow-renderer/examples/02_triangle.rs +++ b/imgui-glow-renderer/examples/02_triangle.rs @@ -42,7 +42,7 @@ fn main() { ui.show_demo_window(&mut true); winit_platform.prepare_render(&ui, window.window()); - let draw_data = ui.render(); + let draw_data = imgui_context.render(); // Render imgui on top of it ig_renderer diff --git a/imgui-glow-renderer/examples/03_triangle_gles.rs b/imgui-glow-renderer/examples/03_triangle_gles.rs index 989a788..1d92da2 100644 --- a/imgui-glow-renderer/examples/03_triangle_gles.rs +++ b/imgui-glow-renderer/examples/03_triangle_gles.rs @@ -56,7 +56,7 @@ fn main() { ui.show_demo_window(&mut true); winit_platform.prepare_render(&ui, window.window()); - let draw_data = ui.render(); + let draw_data = imgui_context.render(); // Render imgui on top ig_renderer diff --git a/imgui-glow-renderer/examples/04_custom_textures.rs b/imgui-glow-renderer/examples/04_custom_textures.rs index 70e4d95..db56dc8 100644 --- a/imgui-glow-renderer/examples/04_custom_textures.rs +++ b/imgui-glow-renderer/examples/04_custom_textures.rs @@ -59,7 +59,7 @@ fn main() { textures_ui.show(&ui); winit_platform.prepare_render(&ui, window.window()); - let draw_data = ui.render(); + let draw_data = imgui_context.render(); ig_renderer .render(&gl, &textures, draw_data) .expect("error rendering imgui");