Fix bad events

This commit is contained in:
Tomaka17 2014-07-30 13:11:49 +02:00
parent 838cc2b325
commit aa7d88dbda
4 changed files with 7 additions and 10 deletions

View file

@ -1,11 +1,8 @@
#[deriving(Clone,Show)] #[deriving(Clone,Show)]
pub enum Event { pub enum Event {
/// The position of the window has changed.
PositionChanged(uint, uint),
/// The size of the window has changed. /// The size of the window has changed.
SizeChanged(uint, uint), Resized(uint, uint),
/// The position of the window has changed. /// The position of the window has changed.
Moved(int, int), Moved(int, int),

View file

@ -1,9 +1,9 @@
#![feature(unsafe_destructor)] #![feature(unsafe_destructor)]
#![feature(globs)]
extern crate libc; extern crate libc;
pub use events::{Event, Element, PositionChanged, SizeChanged, Closed, CursorPositionChanged, Focused}; pub use events::*;
pub use events::{Iconified, NeedRefresh, Pressed, Released};
pub use hints::{Hints, ClientAPI, Profile}; pub use hints::{Hints, ClientAPI, Profile};
#[cfg(windows)] #[cfg(windows)]

View file

@ -362,10 +362,10 @@ extern "stdcall" fn callback(window: ffi::HWND, msg: ffi::UINT,
}, },
ffi::WM_SIZE => { ffi::WM_SIZE => {
use SizeChanged; use Resized;
let w = ffi::LOWORD(lparam as ffi::DWORD) as uint; let w = ffi::LOWORD(lparam as ffi::DWORD) as uint;
let h = ffi::HIWORD(lparam as ffi::DWORD) as uint; let h = ffi::HIWORD(lparam as ffi::DWORD) as uint;
send_event(window, SizeChanged(w, h)); send_event(window, Resized(w, h));
0 0
}, },

View file

@ -173,9 +173,9 @@ impl Window {
}, },
ffi::ResizeRequest => { ffi::ResizeRequest => {
use SizeChanged; use Resized;
let rs_event: &ffi::XResizeRequestEvent = unsafe { mem::transmute(&xev) }; let rs_event: &ffi::XResizeRequestEvent = unsafe { mem::transmute(&xev) };
events.push(SizeChanged(rs_event.width as uint, rs_event.height as uint)); events.push(Resized(rs_event.width as uint, rs_event.height as uint));
}, },
ffi::MotionNotify => { ffi::MotionNotify => {