elias/imgui-rs
1
0
Fork 0
mirror of https://github.com/eliasstepanik/imgui-rs.git synced 2026-01-26 04:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20 from shockham/master

Browse Source 
Updated to glium 0.14
This commit is contained in:
Joonas Javanainen 2016-04-15 00:02:53 +03:00
commit 02fb063ae9
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -15,7 +15,7 @@ default = ["glium"]
libc = "0.2" libc = "0.2"
[dependencies.glium] [dependencies.glium]
version = "0.13" version = "0.14"
default-features = false default-features = false
optional = true optional = true
@ -29,6 +29,6 @@ gcc = "0.3"
time = "0.1" time = "0.1"
[dev-dependencies.glium] [dev-dependencies.glium]
version = "0.13" version = "0.14"
features = ["glutin"] features = ["glutin"]
default-features = false default-features = false

10
examples/support/mod.rs
View File

@ -1,7 +1,7 @@
use glium::{DisplayBuild, Surface}; use glium::{DisplayBuild, Surface};
use glium::backend::glutin_backend::GlutinFacade; use glium::backend::glutin_backend::GlutinFacade;
use glium::glutin; 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::{ImGui, Ui, ImGuiKey};
use imgui::glium_renderer::Renderer; use imgui::glium_renderer::Renderer;
use time::SteadyTime; 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) => Event::MouseInput(state, MouseButton::Left) =>
self.mouse_pressed.0 = state == ElementState::Pressed, self.mouse_pressed.0 = state == ElementState::Pressed,
Event::MouseInput(state, MouseButton::Right) => Event::MouseInput(state, MouseButton::Right) =>
self.mouse_pressed.1 = state == ElementState::Pressed, self.mouse_pressed.1 = state == ElementState::Pressed,
Event::MouseInput(state, MouseButton::Middle) => Event::MouseInput(state, MouseButton::Middle) =>
self.mouse_pressed.2 = state == ElementState::Pressed, self.mouse_pressed.2 = state == ElementState::Pressed,
Event::MouseWheel(MouseScrollDelta::LineDelta(_, y)) => self.mouse_wheel = y, Event::MouseWheel(MouseScrollDelta::LineDelta(_, y), TouchPhase::Moved) =>
Event::MouseWheel(MouseScrollDelta::PixelDelta(_, y)) => self.mouse_wheel = y, self.mouse_wheel = y,
Event::MouseWheel(MouseScrollDelta::PixelDelta(_, y), TouchPhase::Moved) =>
self.mouse_wheel = y,
Event::ReceivedCharacter(c) => self.imgui.add_input_character(c), Event::ReceivedCharacter(c) => self.imgui.add_input_character(c),
_ => () _ => ()
} }

2
imgui-sys/Cargo.toml
View File

@ -16,7 +16,7 @@ bitflags = "0.5"
libc = "0.2" libc = "0.2"
[dependencies.glium] [dependencies.glium]
version = "0.13" version = "0.14"
default-features = false default-features = false
optional = true optional = true