diff options
| author |  Héctor Ramón <hector@hecrj.dev> | 2024-06-11 20:22:44 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-06-11 20:22:44 +0200 |
| commit | e6d0b3bda5042a1017a5944a5227c97e0ed6caf9 (patch) | |
| tree | 916f837424c3baeacc1e0f43b02bc892a3445cbb /widget | |
| parent | bda01567d59c00e42e5a208ee6d9ec4153d5c195 (diff) | |
| parent | 6ea7846d88915f8d820c5126d7757f1346234522 (diff) | |
| download | iced-e6d0b3bda5042a1017a5944a5227c97e0ed6caf9.tar.gz iced-e6d0b3bda5042a1017a5944a5227c97e0ed6caf9.tar.bz2 iced-e6d0b3bda5042a1017a5944a5227c97e0ed6caf9.zip | |
Merge pull request #2456 from iced-rs/window-id-in-event-subscriptions
Introduce `window::Id` to `Event` subscriptions
Diffstat (limited to 'widget')
| -rw-r--r-- | widget/src/canvas.rs | 2 | ||||
| -rw-r--r-- | widget/src/lazy/cache.rs | 1 | ||||
| -rw-r--r-- | widget/src/shader.rs | 4 | ||||
| -rw-r--r-- | widget/src/text_input.rs | 6 |
4 files changed, 7 insertions, 6 deletions
diff --git a/widget/src/canvas.rs b/widget/src/canvas.rs index be09f163..73cef087 100644 --- a/widget/src/canvas.rs +++ b/widget/src/canvas.rs @@ -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 { diff --git a/widget/src/lazy/cache.rs b/widget/src/lazy/cache.rs index f922fd19..b341c234 100644 --- a/widget/src/lazy/cache.rs +++ b/widget/src/lazy/cache.rs @@ -1,3 +1,4 @@ +#![allow(dead_code)] use crate::core::overlay; use crate::core::Element; diff --git a/widget/src/shader.rs b/widget/src/shader.rs index fad2f4eb..3c81f8ed 100644 --- a/widget/src/shader.rs +++ b/widget/src/shader.rs @@ -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 { diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs index 941e9bde..dc4f83e0 100644 --- a/widget/src/text_input.rs +++ b/widget/src/text_input.rs @@ -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 { |