From 822ed103f8880962af7ab9b7bebabe0462676aab Mon Sep 17 00:00:00 2001 From: O01eg Date: Tue, 12 Dec 2017 15:03:16 +0300 Subject: [PATCH] Update glium to 0.19. --- imgui-examples/Cargo.toml | 6 +++--- imgui-examples/examples/support/mod.rs | 2 +- imgui-examples/examples/support_gfx/mod.rs | 2 +- imgui-glium-renderer/Cargo.toml | 2 +- imgui-sys/Cargo.toml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/imgui-examples/Cargo.toml b/imgui-examples/Cargo.toml index b3bcfe7..74e24fb 100644 --- a/imgui-examples/Cargo.toml +++ b/imgui-examples/Cargo.toml @@ -10,9 +10,9 @@ publish = false [dev-dependencies] gfx = "0.16" -gfx_window_glutin = "0.18" -glium = { version = "0.18", default-features = true } -glutin = "0.10" +gfx_window_glutin = "0.19" +glium = { version = "0.19", default-features = true } +glutin = "0.11" imgui = { version = "0.0.18-pre", path = "../" } imgui-gfx-renderer = { version = "0.0.18-pre", path = "../imgui-gfx-renderer" } imgui-glium-renderer = { version = "0.0.18-pre", path = "../imgui-glium-renderer" } diff --git a/imgui-examples/examples/support/mod.rs b/imgui-examples/examples/support/mod.rs index 2d06c51..3c4efac 100644 --- a/imgui-examples/examples/support/mod.rs +++ b/imgui-examples/examples/support/mod.rs @@ -72,7 +72,7 @@ pub fn run bool>(title: String, clear_color: [f32; 4], mut run_ _ => {} } } - MouseMoved { position: (x, y), .. } => mouse_state.pos = (x as i32, y as i32), + CursorMoved { position: (x, y), .. } => mouse_state.pos = (x as i32, y as i32), MouseInput { state, button, .. } => { match button { MouseButton::Left => mouse_state.pressed.0 = state == Pressed, diff --git a/imgui-examples/examples/support_gfx/mod.rs b/imgui-examples/examples/support_gfx/mod.rs index 11605be..738bc3f 100644 --- a/imgui-examples/examples/support_gfx/mod.rs +++ b/imgui-examples/examples/support_gfx/mod.rs @@ -99,7 +99,7 @@ pub fn run bool>(title: String, clear_color: [f32; 4], mut run_ _ => {} } } - MouseMoved { position: (x, y), .. } => mouse_state.pos = (x as i32, y as i32), + CursorMoved { position: (x, y), .. } => mouse_state.pos = (x as i32, y as i32), MouseInput { state, button, .. } => { match button { MouseButton::Left => mouse_state.pressed.0 = state == Pressed, diff --git a/imgui-glium-renderer/Cargo.toml b/imgui-glium-renderer/Cargo.toml index e9c4f17..58038e0 100644 --- a/imgui-glium-renderer/Cargo.toml +++ b/imgui-glium-renderer/Cargo.toml @@ -12,6 +12,6 @@ categories = ["gui", "rendering"] travis-ci = { repository = "Gekkio/imgui-rs" } [dependencies] -glium = { version = "0.18", default-features = false } +glium = { version = "0.19", default-features = false } imgui = { version = "0.0.18-pre", path = "../" } imgui-sys = { version = "0.0.18-pre", path = "../imgui-sys", features = ["glium"] } diff --git a/imgui-sys/Cargo.toml b/imgui-sys/Cargo.toml index 0287615..76c7826 100644 --- a/imgui-sys/Cargo.toml +++ b/imgui-sys/Cargo.toml @@ -14,7 +14,7 @@ travis-ci = { repository = "Gekkio/imgui-rs" } [dependencies] bitflags = "1.0" -glium = { version = "0.18", default-features = false, optional = true } +glium = { version = "0.19", default-features = false, optional = true } gfx = { version = "0.16", optional = true } [build-dependencies]