me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Produce new window file events in iced_winit

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-01-16 07:18:17 +01:00
parent f73bacb454
commit b3106738eb
2 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
native/src/window/event.rs
View file

@ -26,7 +26,7 @@ pub enum Event {
/// A file was hovered, but has exited the window.
///
/// There will be a single `FilesLeft` event triggered even if multiple
/// files were hovered.
FilesLeft,
/// There will be a single `FilesHoveredLeft` event triggered even if
/// multiple files were hovered.
FilesHoveredLeft,
}

31
winit/src/application.rs
View file

@ -302,6 +302,18 @@ pub trait Application: Sized {
event: window_event,
..
} => match window_event {
WindowEvent::Resized(new_size) => {
events.push(Event::Window(window::Event::Resized {
width: new_size.width.round() as u32,
height: new_size.height.round() as u32,
}));
size = new_size;
resized = true;
}
WindowEvent::CloseRequested => {
*control_flow = ControlFlow::Exit;
}
WindowEvent::CursorMoved { position, .. } => {
events.push(Event::Mouse(mouse::Event::CursorMoved {
x: position.x as f32,
@ -370,17 +382,16 @@ pub trait Application: Sized {
modifiers: conversion::modifiers_state(modifiers),
}));
}
WindowEvent::CloseRequested => {
*control_flow = ControlFlow::Exit;
WindowEvent::HoveredFile(path) => {
events
.push(Event::Window(window::Event::FileHovered(path)));
}
WindowEvent::Resized(new_size) => {
events.push(Event::Window(window::Event::Resized {
width: new_size.width.round() as u32,
height: new_size.height.round() as u32,
}));
size = new_size;
resized = true;
WindowEvent::DroppedFile(path) => {
events
.push(Event::Window(window::Event::FileDropped(path)));
}
WindowEvent::HoveredFileCancelled => {
events.push(Event::Window(window::Event::FilesHoveredLeft));
}
_ => {}
},