diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/events.rs | 5 | ||||
| -rw-r--r-- | src/lib.rs | 4 | ||||
| -rw-r--r-- | src/win32/mod.rs | 4 | ||||
| -rw-r--r-- | src/x11/mod.rs | 4 |
4 files changed, 7 insertions, 10 deletions
diff --git a/src/events.rs b/src/events.rs index 3e2143a..826a7cb 100644 --- a/src/events.rs +++ b/src/events.rs @@ -1,11 +1,8 @@ #[deriving(Clone,Show)] pub enum Event { - /// The position of the window has changed. - PositionChanged(uint, uint), - /// The size of the window has changed. - SizeChanged(uint, uint), + Resized(uint, uint), /// The position of the window has changed. Moved(int, int), @@ -1,9 +1,9 @@ #![feature(unsafe_destructor)] +#![feature(globs)] extern crate libc; -pub use events::{Event, Element, PositionChanged, SizeChanged, Closed, CursorPositionChanged, Focused}; -pub use events::{Iconified, NeedRefresh, Pressed, Released}; +pub use events::*; pub use hints::{Hints, ClientAPI, Profile}; #[cfg(windows)] diff --git a/src/win32/mod.rs b/src/win32/mod.rs index 9d44e02..bc268fc 100644 --- a/src/win32/mod.rs +++ b/src/win32/mod.rs @@ -362,10 +362,10 @@ extern "stdcall" fn callback(window: ffi::HWND, msg: ffi::UINT, }, ffi::WM_SIZE => { - use SizeChanged; + use Resized; let w = ffi::LOWORD(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 }, diff --git a/src/x11/mod.rs b/src/x11/mod.rs index 68a061b..b099ef5 100644 --- a/src/x11/mod.rs +++ b/src/x11/mod.rs @@ -173,9 +173,9 @@ impl Window { }, ffi::ResizeRequest => { - use SizeChanged; + use Resized; 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 => { |