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

add window::Id to Event and Action

Browse source
This commit is contained in:
Richard 2022-09-19 20:59:37 -03:00 • committed by bungoboingo
parent 974cc6b6f5
commit 0ad53a3d5c
11 changed files with 99 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/events/src/main.rs
View file

@ -52,7 +52,7 @@ impl Application for Events {
}
}
Message::EventOccurred(event) => {
if let Event::Window(window::Event::CloseRequested) = event {
if let Event::Window(_, window::Event::CloseRequested) = event {
self.should_exit = true;
}
}

2
examples/integration_opengl/src/main.rs
View file

@ -13,6 +13,7 @@ use iced_glow::{Backend, Renderer, Settings, Viewport};
use iced_glutin::conversion;
use iced_glutin::glutin;
use iced_glutin::renderer;
use iced_glutin::window;
use iced_glutin::{program, Clipboard, Color, Debug, Size};
pub fn main() {
@ -107,6 +108,7 @@ pub fn main() {
// Map window event to iced event
if let Some(event) = iced_winit::conversion::window_event(
window::Id::MAIN,
&event,
windowed_context.window().scale_factor(),
modifiers,

5
examples/integration_wgpu/src/main.rs
View file

@ -6,8 +6,8 @@ use scene::Scene;
use iced_wgpu::{wgpu, Backend, Renderer, Settings, Viewport};
use iced_winit::{
conversion, futures, program, renderer, winit, Clipboard, Color, Debug,
Size,
conversion, futures, program, renderer, window, winit, Clipboard, Color,
Debug, Size,
};
use winit::{
@ -169,6 +169,7 @@ pub fn main() {
// Map window event to iced event
if let Some(event) = iced_winit::conversion::window_event(
window::Id::MAIN,
&event,
window.scale_factor(),
modifiers,