-
Notifications
You must be signed in to change notification settings - Fork 914
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'new-keyboard' into new-keyboard-web
- Loading branch information
Showing
48 changed files
with
1,241 additions
and
551 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,3 +7,4 @@ rls/ | |
| *.ts | ||
| *.js | ||
| #*# | ||
| .DS_Store | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| use simple_logger::SimpleLogger; | ||
| use winit::{ | ||
| event::{ElementState, Event, KeyEvent, MouseButton, StartCause, WindowEvent}, | ||
| event_loop::{ControlFlow, EventLoop}, | ||
| keyboard::Key, | ||
| window::{Window, WindowBuilder, WindowId}, | ||
| }; | ||
|
|
||
| fn main() { | ||
| SimpleLogger::new().init().unwrap(); | ||
| let event_loop = EventLoop::new(); | ||
|
|
||
| let window_1 = WindowBuilder::new().build(&event_loop).unwrap(); | ||
| let window_2 = WindowBuilder::new().build(&event_loop).unwrap(); | ||
|
|
||
| let mut switched = false; | ||
| let mut entered_id = window_2.id(); | ||
|
|
||
| event_loop.run(move |event, _, control_flow| match event { | ||
| Event::NewEvents(StartCause::Init) => { | ||
| eprintln!("Switch which window is to be dragged by pressing \"x\".") | ||
| } | ||
| Event::WindowEvent { event, window_id } => match event { | ||
| WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit, | ||
| WindowEvent::MouseInput { | ||
| state: ElementState::Pressed, | ||
| button: MouseButton::Left, | ||
| .. | ||
| } => { | ||
| let window = if (window_id == window_1.id() && switched) | ||
| || (window_id == window_2.id() && !switched) | ||
| { | ||
| &window_2 | ||
| } else { | ||
| &window_1 | ||
| }; | ||
|
|
||
| window.drag_window().unwrap() | ||
| } | ||
| WindowEvent::CursorEntered { .. } => { | ||
| entered_id = window_id; | ||
| name_windows(entered_id, switched, &window_1, &window_2) | ||
| } | ||
| WindowEvent::KeyboardInput { | ||
| event: | ||
| KeyEvent { | ||
| state: ElementState::Released, | ||
| logical_key: Key::Character("x"), | ||
| .. | ||
| }, | ||
| .. | ||
| } => { | ||
| switched = !switched; | ||
| name_windows(entered_id, switched, &window_1, &window_2); | ||
| println!("Switched!") | ||
| } | ||
| _ => (), | ||
| }, | ||
| _ => (), | ||
| }); | ||
| } | ||
|
|
||
| fn name_windows(window_id: WindowId, switched: bool, window_1: &Window, window_2: &Window) { | ||
| let (drag_target, other) = | ||
| if (window_id == window_1.id() && switched) || (window_id == window_2.id() && !switched) { | ||
| (&window_2, &window_1) | ||
| } else { | ||
| (&window_1, &window_2) | ||
| }; | ||
| drag_target.set_title("drag target"); | ||
| other.set_title("winit window"); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| use simple_logger::SimpleLogger; | ||
| use winit::{ | ||
| event::{DeviceEvent, Event, WindowEvent}, | ||
| event_loop::{ControlFlow, EventLoop}, | ||
| window::WindowBuilder, | ||
| }; | ||
|
|
||
| fn main() { | ||
| SimpleLogger::new().init().unwrap(); | ||
| let event_loop = EventLoop::new(); | ||
|
|
||
| let window = WindowBuilder::new() | ||
| .with_title("Mouse Wheel events") | ||
| .build(&event_loop) | ||
| .unwrap(); | ||
|
|
||
| event_loop.run(move |event, _, control_flow| { | ||
| *control_flow = ControlFlow::Wait; | ||
|
|
||
| match event { | ||
| Event::WindowEvent { event, .. } => match event { | ||
| WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit, | ||
| _ => (), | ||
| }, | ||
| Event::DeviceEvent { event, .. } => match event { | ||
| DeviceEvent::MouseWheel { delta } => match delta { | ||
| winit::event::MouseScrollDelta::LineDelta(x, y) => { | ||
| println!("mouse wheel Line Delta: ({},{})", x, y); | ||
| let pixels_per_line = 120.0; | ||
| let mut pos = window.outer_position().unwrap(); | ||
| pos.x -= (x * pixels_per_line) as i32; | ||
| pos.y -= (y * pixels_per_line) as i32; | ||
| window.set_outer_position(pos) | ||
| } | ||
| winit::event::MouseScrollDelta::PixelDelta(p) => { | ||
| println!("mouse wheel Pixel Delta: ({},{})", p.x, p.y); | ||
| let mut pos = window.outer_position().unwrap(); | ||
| pos.x -= p.x as i32; | ||
| pos.y -= p.y as i32; | ||
| window.set_outer_position(pos) | ||
| } | ||
| }, | ||
| _ => (), | ||
| }, | ||
| _ => (), | ||
| } | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.