From e400f972c1fe6fa4f70f8cfe559ded680e6cf740 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 4 Jun 2024 23:20:33 +0200
Subject: Introduce `window::Id` to `Event` subscriptions
And remove `window::Id` from `Event` altogether.
---
widget/src/shader.rs | 2 +-
widget/src/text_input.rs | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'widget')
diff --git a/widget/src/shader.rs b/widget/src/shader.rs
index fad2f4eb..473cfd0d 100644
--- a/widget/src/shader.rs
+++ b/widget/src/shader.rs
@@ -107,7 +107,7 @@ 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,
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 {
--
cgit
From 5d7dcf417c694853a606b8fb0a47a580277fc9c0 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 11 Jun 2024 19:41:05 +0200
Subject: Introduce `subscription::Event`
... and remove `PlatformSpecific` from `Event`
---
widget/src/canvas.rs | 2 +-
widget/src/shader.rs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'widget')
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/shader.rs b/widget/src/shader.rs
index 473cfd0d..3c81f8ed 100644
--- a/widget/src/shader.rs
+++ b/widget/src/shader.rs
@@ -110,7 +110,7 @@ where
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 {
--
cgit
From df85d85a6fa1e50dc0e21b0b0580eb5f797a80fd Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 11 Jun 2024 20:07:06 +0200
Subject: Allow `dead_code` in `widget::lazy::cache`
---
widget/src/lazy/cache.rs | 1 +
1 file changed, 1 insertion(+)
(limited to 'widget')
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;
--
cgit