Rename enum variants of MouseButton
With enums that are namespaced by default, it seems reasonable to be less redundant in the variant naming here.
This commit is contained in:
parent
a3cd89c2dc
commit
b2367fe2e6
5 changed files with 28 additions and 28 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue