alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-25 06:41:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Rename enum variants of MouseButton

Browse source 
With enums that are namespaced by default, it seems reasonable to be less
redundant in the variant naming here.
This commit is contained in:
Eduard Bopp 2015-02-05 16:52:53 +01:00
parent a3cd89c2dc
commit b2367fe2e6
5 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/android/mod.rs
View file

@ -7,7 +7,7 @@ use {CreationError, Event, MouseCursor};
use CreationError::OsError; use CreationError::OsError;
use events::ElementState::{Pressed, Released}; use events::ElementState::{Pressed, Released};
use events::Event::{MouseInput, MouseMoved}; use events::Event::{MouseInput, MouseMoved};
use events::MouseButton::LeftMouseButton; use events::MouseButton;
use std::collections::RingBuf; use std::collections::RingBuf;
@ -232,10 +232,10 @@ impl Window {
match self.event_rx.try_recv() { match self.event_rx.try_recv() {
Ok(event) => match event { Ok(event) => match event {
android_glue::Event::EventDown => { android_glue::Event::EventDown => {
events.push_back(MouseInput(Pressed, LeftMouseButton)); events.push_back(MouseInput(Pressed, MouseButton::Left));
}, },
android_glue::Event::EventUp => { android_glue::Event::EventUp => {
events.push_back(MouseInput(Released, LeftMouseButton)); events.push_back(MouseInput(Released, MouseButton::Left));
}, },
android_glue::Event::EventMove(x, y) => { android_glue::Event::EventMove(x, y) => {
events.push_back(MouseMoved((x as i32, y as i32))); events.push_back(MouseMoved((x as i32, y as i32)));

10
src/cocoa/mod.rs
View file

@ -29,7 +29,7 @@ use std::ascii::AsciiExt;
use events::Event::{MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput, MouseWheel}; use events::Event::{MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput, MouseWheel};
use events::ElementState::{Pressed, Released}; use events::ElementState::{Pressed, Released};
use events::MouseButton::{LeftMouseButton, RightMouseButton}; use events::MouseButton;
use events; use events;
pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor}; pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor};
@ -433,10 +433,10 @@ impl Window {
} }
match msg_send()(event, selector("type")) { match msg_send()(event, selector("type")) {
NSLeftMouseDown => { events.push_back(MouseInput(Pressed, LeftMouseButton)); }, NSLeftMouseDown => { events.push_back(MouseInput(Pressed, MouseButton::Left)); },
NSLeftMouseUp => { events.push_back(MouseInput(Released, LeftMouseButton)); }, NSLeftMouseUp => { events.push_back(MouseInput(Released, MouseButton::Left)); },
NSRightMouseDown => { events.push_back(MouseInput(Pressed, RightMouseButton)); }, NSRightMouseDown => { events.push_back(MouseInput(Pressed, MouseButton::Right)); },
NSRightMouseUp => { events.push_back(MouseInput(Released, RightMouseButton)); }, NSRightMouseUp => { events.push_back(MouseInput(Released, MouseButton::Right)); },
NSMouseMoved => { NSMouseMoved => {
let window_point: NSPoint = msg_send()(event, selector("locationInWindow")); let window_point: NSPoint = msg_send()(event, selector("locationInWindow"));
// let window_point = event.locationInWindow(); // let window_point = event.locationInWindow();

8
src/events.rs
View file

@ -46,10 +46,10 @@ pub enum ElementState {
#[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)] #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
pub enum MouseButton { pub enum MouseButton {
LeftMouseButton, Left,
RightMouseButton, Right,
MiddleMouseButton, Middle,
OtherMouseButton(u8), Other(u8),
} }
#[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)] #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]

24
src/win32/init.rs
View file

@ -542,49 +542,49 @@ extern "system" fn callback(window: winapi::HWND, msg: winapi::UINT,
winapi::WM_LBUTTONDOWN => { winapi::WM_LBUTTONDOWN => {
use events::Event::MouseInput; use events::Event::MouseInput;
use events::MouseButton::LeftMouseButton; use events::MouseButton::Left;
use events::ElementState::Pressed; use events::ElementState::Pressed;
send_event(window, MouseInput(Pressed, LeftMouseButton)); send_event(window, MouseInput(Pressed, Left));
0 0
}, },
winapi::WM_LBUTTONUP => { winapi::WM_LBUTTONUP => {
use events::Event::MouseInput; use events::Event::MouseInput;
use events::MouseButton::LeftMouseButton; use events::MouseButton::Left;
use events::ElementState::Released; use events::ElementState::Released;
send_event(window, MouseInput(Released, LeftMouseButton)); send_event(window, MouseInput(Released, Left));
0 0
}, },
winapi::WM_RBUTTONDOWN => { winapi::WM_RBUTTONDOWN => {
use events::Event::MouseInput; use events::Event::MouseInput;
use events::MouseButton::RightMouseButton; use events::MouseButton::Right;
use events::ElementState::Pressed; use events::ElementState::Pressed;
send_event(window, MouseInput(Pressed, RightMouseButton)); send_event(window, MouseInput(Pressed, Right));
0 0
}, },
winapi::WM_RBUTTONUP => { winapi::WM_RBUTTONUP => {
use events::Event::MouseInput; use events::Event::MouseInput;
use events::MouseButton::RightMouseButton; use events::MouseButton::Right;
use events::ElementState::Released; use events::ElementState::Released;
send_event(window, MouseInput(Released, RightMouseButton)); send_event(window, MouseInput(Released, Right));
0 0
}, },
winapi::WM_MBUTTONDOWN => { winapi::WM_MBUTTONDOWN => {
use events::Event::MouseInput; use events::Event::MouseInput;
use events::MouseButton::MiddleMouseButton; use events::MouseButton::Middle;
use events::ElementState::Pressed; use events::ElementState::Pressed;
send_event(window, MouseInput(Pressed, MiddleMouseButton)); send_event(window, MouseInput(Pressed, Middle));
0 0
}, },
winapi::WM_MBUTTONUP => { winapi::WM_MBUTTONUP => {
use events::Event::MouseInput; use events::Event::MouseInput;
use events::MouseButton::MiddleMouseButton; use events::MouseButton::Middle;
use events::ElementState::Released; use events::ElementState::Released;
send_event(window, MouseInput(Released, MiddleMouseButton)); send_event(window, MouseInput(Released, Middle));
0 0
}, },

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

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