diff --git a/Cargo.toml b/Cargo.toml index b9a13ea..e62e7c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ default = ["glium"] libc = "0.2" [dependencies.glium] -version = "0.13" +version = "0.14" default-features = false optional = true @@ -29,6 +29,6 @@ gcc = "0.3" time = "0.1" [dev-dependencies.glium] -version = "0.13" +version = "0.14" features = ["glutin"] default-features = false diff --git a/examples/support/mod.rs b/examples/support/mod.rs index a7a6e58..fe654c0 100644 --- a/examples/support/mod.rs +++ b/examples/support/mod.rs @@ -1,7 +1,7 @@ use glium::{DisplayBuild, Surface}; use glium::backend::glutin_backend::GlutinFacade; use glium::glutin; -use glium::glutin::{ElementState, Event, MouseButton, MouseScrollDelta, VirtualKeyCode}; +use glium::glutin::{ElementState, Event, MouseButton, MouseScrollDelta, VirtualKeyCode, TouchPhase}; use imgui::{ImGui, Ui, ImGuiKey}; use imgui::glium_renderer::Renderer; use time::SteadyTime; @@ -119,15 +119,17 @@ impl Support { _ => {}, } }, - Event::MouseMoved(pos) => self.mouse_pos = pos, + Event::MouseMoved(x, y) => self.mouse_pos = (x, y), Event::MouseInput(state, MouseButton::Left) => self.mouse_pressed.0 = state == ElementState::Pressed, Event::MouseInput(state, MouseButton::Right) => self.mouse_pressed.1 = state == ElementState::Pressed, Event::MouseInput(state, MouseButton::Middle) => self.mouse_pressed.2 = state == ElementState::Pressed, - Event::MouseWheel(MouseScrollDelta::LineDelta(_, y)) => self.mouse_wheel = y, - Event::MouseWheel(MouseScrollDelta::PixelDelta(_, y)) => self.mouse_wheel = y, + Event::MouseWheel(MouseScrollDelta::LineDelta(_, y), TouchPhase::Moved) => + self.mouse_wheel = y, + Event::MouseWheel(MouseScrollDelta::PixelDelta(_, y), TouchPhase::Moved) => + self.mouse_wheel = y, Event::ReceivedCharacter(c) => self.imgui.add_input_character(c), _ => () } diff --git a/imgui-sys/Cargo.toml b/imgui-sys/Cargo.toml index f6a8248..5b29c83 100644 --- a/imgui-sys/Cargo.toml +++ b/imgui-sys/Cargo.toml @@ -16,7 +16,7 @@ bitflags = "0.5" libc = "0.2" [dependencies.glium] -version = "0.13" +version = "0.14" default-features = false optional = true