alex/baseview
1
0
Fork 0
Code Activity

rebase, cargo fmt

Browse source
This commit is contained in:
Billy Messenger 2020-09-11 12:38:06 -05:00
parent 08564cc317
commit cc2ae0ef39
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/open_window.rs
View file

@ -15,7 +15,7 @@ impl WindowHandler for MyProgram {
match event { match event {
Event::Mouse(e) => println!("Mouse event: {:?}", e), Event::Mouse(e) => println!("Mouse event: {:?}", e),
Event::Keyboard(e) => println!("Keyboard event: {:?}", e), Event::Keyboard(e) => println!("Keyboard event: {:?}", e),
Event::Window(e) => println!("Window event: {:?}", e) Event::Window(e) => println!("Window event: {:?}", e),
} }
} }

2
src/event.rs
View file

@ -91,5 +91,5 @@ pub enum WindowEvent {
pub enum Event { pub enum Event {
Mouse(MouseEvent), Mouse(MouseEvent),
Keyboard(KeyboardEvent), Keyboard(KeyboardEvent),
Window(WindowEvent) Window(WindowEvent),
} }

4
src/macos/window.rs
View file

@ -11,8 +11,8 @@ use cocoa::foundation::{NSAutoreleasePool, NSPoint, NSRect, NSSize, NSString};
use raw_window_handle::{macos::MacOSHandle, HasRawWindowHandle, RawWindowHandle}; use raw_window_handle::{macos::MacOSHandle, HasRawWindowHandle, RawWindowHandle};
use crate::{ use crate::{
Event, KeyboardEvent, MouseButton, MouseEvent, ScrollDelta, WindowEvent, Event, KeyboardEvent, MouseButton, MouseEvent, ScrollDelta, WindowEvent, WindowHandler,
WindowHandler, WindowOpenOptions, WindowOpenOptions,
}; };
pub struct Window { pub struct Window {

4
src/win/window.rs
View file

@ -19,8 +19,8 @@ use std::rc::Rc;
use raw_window_handle::{windows::WindowsHandle, HasRawWindowHandle, RawWindowHandle}; use raw_window_handle::{windows::WindowsHandle, HasRawWindowHandle, RawWindowHandle};
use crate::{ use crate::{
Event, KeyboardEvent, MouseButton, MouseEvent, Parent::WithParent, ScrollDelta, Event, KeyboardEvent, MouseButton, MouseEvent, Parent::WithParent, ScrollDelta, WindowEvent,
WindowEvent, WindowHandler, WindowInfo, WindowOpenOptions, WindowHandler, WindowInfo, WindowOpenOptions,
}; };
unsafe fn message_box(title: &str, msg: &str) { unsafe fn message_box(title: &str, msg: &str) {

4
src/x11/window.rs
View file

@ -6,8 +6,8 @@ use raw_window_handle::{unix::XlibHandle, HasRawWindowHandle, RawWindowHandle};
use super::XcbConnection; use super::XcbConnection;
use crate::{ use crate::{
Event, KeyboardEvent, MouseButton, MouseEvent, Parent, ScrollDelta, WindowEvent, Event, KeyboardEvent, MouseButton, MouseEvent, Parent, ScrollDelta, WindowEvent, WindowHandler,
WindowHandler, WindowOpenOptions, WindowInfo, WindowInfo, WindowOpenOptions,
}; };
pub struct Window { pub struct Window {