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

Merge pull request #2456 from iced-rs/window-id-in-event-subscriptions

Browse source 
Introduce `window::Id` to `Event` subscriptions
This commit is contained in:
Héctor Ramón 2024-06-11 20:22:44 +02:00 • committed by GitHub
commit e6d0b3bda5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 225 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

2
widget/src/canvas.rs
View file

@ -172,7 +172,7 @@ where
core::Event::Keyboard(keyboard_event) => {
Some(Event::Keyboard(keyboard_event))
}
_ => None,
core::Event::Window(_) => None,
};
if let Some(canvas_event) = canvas_event {

1
widget/src/lazy/cache.rs
View file

@ -1,3 +1,4 @@
#![allow(dead_code)]
use crate::core::overlay;
use crate::core::Element;

4
widget/src/shader.rs
View file

@ -107,10 +107,10 @@ where
Some(Event::Keyboard(keyboard_event))
}
core::Event::Touch(touch_event) => Some(Event::Touch(touch_event)),
core::Event::Window(_, window::Event::RedrawRequested(instant)) => {
core::Event::Window(window::Event::RedrawRequested(instant)) => {
Some(Event::RedrawRequested(instant))
}
_ => None,
core::Event::Window(_) => None,
};
if let Some(custom_shader_event) = custom_shader_event {

6
widget/src/text_input.rs
View file

@ -1003,14 +1003,14 @@ where
state.keyboard_modifiers = modifiers;
}
Event::Window(_, window::Event::Unfocused) => {
Event::Window(window::Event::Unfocused) => {
let state = state::<Renderer>(tree);
if let Some(focus) = &mut state.is_focused {
focus.is_window_focused = false;
}
}
Event::Window(_, window::Event::Focused) => {
Event::Window(window::Event::Focused) => {
let state = state::<Renderer>(tree);
if let Some(focus) = &mut state.is_focused {
@ -1020,7 +1020,7 @@ where
shell.request_redraw(window::RedrawRequest::NextFrame);
}
}
Event::Window(_, window::Event::RedrawRequested(now)) => {
Event::Window(window::Event::RedrawRequested(now)) => {
let state = state::<Renderer>(tree);
if let Some(focus) = &mut state.is_focused {