elias/imgui-rs
1
0
Fork 0
mirror of https://github.com/eliasstepanik/imgui-rs.git synced 2026-01-11 13:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated to glium 0.14

Browse Source
This commit is contained in:
shockham 2016-04-13 10:29:59 +01:00
parent 2cb687141b
commit a503ffe365
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"
[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

10
examples/support/mod.rs
View File

@ -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),
_ => ()
}

2
imgui-sys/Cargo.toml
View File

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