Merge branch 'master' of https://github.com/RustAudio/baseview into master
This commit is contained in:
commit
08564cc317
|
@ -15,8 +15,7 @@ impl WindowHandler for MyProgram {
|
|||
match event {
|
||||
Event::Mouse(e) => println!("Mouse event: {:?}", e),
|
||||
Event::Keyboard(e) => println!("Keyboard event: {:?}", e),
|
||||
Event::Window(e) => println!("Window event: {:?}", e),
|
||||
Event::FileDrop(e) => println!("File drop event: {:?}", e),
|
||||
Event::Window(e) => println!("Window event: {:?}", e)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
17
src/event.rs
17
src/event.rs
|
@ -1,5 +1,3 @@
|
|||
use std::path::PathBuf;
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq)]
|
||||
pub enum KeyboardEvent {
|
||||
KeyPressed(u32),
|
||||
|
@ -89,22 +87,9 @@ pub enum WindowEvent {
|
|||
WillClose,
|
||||
}
|
||||
|
||||
#[derive(PartialEq, Clone, Debug)]
|
||||
pub enum FileDropEvent {
|
||||
/// A file is being hovered over the window.
|
||||
FileHovered(PathBuf),
|
||||
|
||||
/// A file has beend dropped into the window.
|
||||
FileDropped(PathBuf),
|
||||
|
||||
/// A file was hovered, but has exited the window.
|
||||
FilesHoveredLeft,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum Event {
|
||||
Mouse(MouseEvent),
|
||||
Keyboard(KeyboardEvent),
|
||||
Window(WindowEvent),
|
||||
FileDrop(FileDropEvent),
|
||||
Window(WindowEvent)
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@ use cocoa::foundation::{NSAutoreleasePool, NSPoint, NSRect, NSSize, NSString};
|
|||
use raw_window_handle::{macos::MacOSHandle, HasRawWindowHandle, RawWindowHandle};
|
||||
|
||||
use crate::{
|
||||
Event, FileDropEvent, KeyboardEvent, MouseButton, MouseEvent, ScrollDelta, WindowEvent,
|
||||
Event, KeyboardEvent, MouseButton, MouseEvent, ScrollDelta, WindowEvent,
|
||||
WindowHandler, WindowOpenOptions,
|
||||
};
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ use std::rc::Rc;
|
|||
use raw_window_handle::{windows::WindowsHandle, HasRawWindowHandle, RawWindowHandle};
|
||||
|
||||
use crate::{
|
||||
Event, FileDropEvent, KeyboardEvent, MouseButton, MouseEvent, Parent::WithParent, ScrollDelta,
|
||||
Event, KeyboardEvent, MouseButton, MouseEvent, Parent::WithParent, ScrollDelta,
|
||||
WindowEvent, WindowHandler, WindowInfo, WindowOpenOptions,
|
||||
};
|
||||
|
||||
|
|
|
@ -6,8 +6,8 @@ use raw_window_handle::{unix::XlibHandle, HasRawWindowHandle, RawWindowHandle};
|
|||
|
||||
use super::XcbConnection;
|
||||
use crate::{
|
||||
Event, FileDropEvent, KeyboardEvent, MouseButton, MouseEvent, Parent, ScrollDelta, WindowEvent,
|
||||
WindowHandler, WindowInfo, WindowOpenOptions,
|
||||
Event, KeyboardEvent, MouseButton, MouseEvent, Parent, ScrollDelta, WindowEvent,
|
||||
WindowHandler, WindowOpenOptions, WindowInfo,
|
||||
};
|
||||
|
||||
pub struct Window {
|
||||
|
|
Loading…
Reference in a new issue