leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #254 from aepsil0n/mousebutton-renaming

Browse source 
Rename enum variants of MouseButton
This commit is contained in:
tomaka 2015-02-05 18:37:53 +01:00
commit 6b52bf95a4
5 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/x11/window/mod.rs
View file

@ -594,16 +594,16 @@ impl Window {
ffi::ButtonPress | ffi::ButtonRelease => {
use events::Event::{MouseInput, MouseWheel};
use events::ElementState::{Pressed, Released};
use events::MouseButton::{LeftMouseButton, RightMouseButton, MiddleMouseButton};
use events::MouseButton::{Left, Right, Middle};
let event: &ffi::XButtonEvent = unsafe { mem::transmute(&xev) };
let state = if xev.type_ == ffi::ButtonPress { Pressed } else { Released };
let button = match event.button {
ffi::Button1 => Some(LeftMouseButton),
ffi::Button2 => Some(MiddleMouseButton),
ffi::Button3 => Some(RightMouseButton),
ffi::Button1 => Some(Left),
ffi::Button2 => Some(Middle),
ffi::Button3 => Some(Right),
ffi::Button4 => {
events.push_back(MouseWheel(1));
None