leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Draft test recorder structure in iced_devtools

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2025-05-28 19:58:43 +02:00
parent ca6d992d67
commit 327522eb99
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
16 changed files with 641 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

19
widget/src/helpers.rs
View file

@ -997,7 +997,6 @@ pub fn pop<'a, Message, Theme, Renderer>(
) -> Pop<'a, (), Message, Theme, Renderer>
where
Renderer: core::Renderer,
Message: Clone,
{
Pop::new(content)
}
@ -2054,22 +2053,14 @@ where
}
/// A widget that applies any `Theme` to its contents.
pub fn themer<'a, Message, OldTheme, NewTheme, Renderer>(
new_theme: NewTheme,
content: impl Into<Element<'a, Message, NewTheme, Renderer>>,
) -> Themer<
'a,
Message,
OldTheme,
NewTheme,
impl Fn(&OldTheme) -> NewTheme,
Renderer,
>
pub fn themer<'a, Message, Theme, Renderer>(
theme: Theme,
content: impl Into<Element<'a, Message, Theme, Renderer>>,
) -> Themer<'a, Message, Theme, Renderer>
where
Renderer: core::Renderer,
NewTheme: Clone,
{
Themer::new(move |_| new_theme.clone(), content)
Themer::new(theme, content)
}
/// Creates a [`PaneGrid`] with the given [`pane_grid::State`] and view function.

9
widget/src/pop.rs
View file

@ -34,7 +34,6 @@ pub struct Pop<
impl<'a, Message, Theme, Renderer> Pop<'a, (), Message, Theme, Renderer>
where
Message: Clone,
Renderer: core::Renderer,
{
/// Creates a new [`Pop`] widget with the given content.
@ -55,7 +54,6 @@ where
impl<'a, Key, Message, Theme, Renderer> Pop<'a, Key, Message, Theme, Renderer>
where
Message: Clone,
Key: self::Key,
Renderer: core::Renderer,
{
@ -163,7 +161,6 @@ impl<Key, Message, Theme, Renderer> Widget<Message, Theme, Renderer>
for Pop<'_, Key, Message, Theme, Renderer>
where
Key: self::Key,
Message: Clone,
Renderer: core::Renderer,
{
fn tag(&self) -> tree::Tag {
@ -243,8 +240,8 @@ where
if let Some(on_show) = &self.on_show {
shell.publish(on_show(layout.bounds().size()));
}
} else if let Some(on_hide) = &self.on_hide {
shell.publish(on_hide.clone());
} else if let Some(on_hide) = self.on_hide.take() {
shell.publish(on_hide);
}
state.should_notify_at = None;
@ -362,7 +359,7 @@ impl<'a, Key, Message, Theme, Renderer>
From<Pop<'a, Key, Message, Theme, Renderer>>
for Element<'a, Message, Theme, Renderer>
where
Message: Clone + 'a,
Message: 'a,
Key: self::Key + 'a,
Renderer: core::Renderer + 'a,
Theme: 'a,

94
widget/src/themer.rs
View file

@ -10,63 +10,55 @@ use crate::core::{
Shell, Size, Vector, Widget,
};
use std::marker::PhantomData;
/// A widget that applies any `Theme` to its contents.
///
/// This widget can be useful to leverage multiple `Theme`
/// types in an application.
#[allow(missing_debug_implementations)]
pub struct Themer<'a, Message, Theme, NewTheme, F, Renderer = crate::Renderer>
pub struct Themer<'a, Message, Theme, Renderer = crate::Renderer>
where
F: Fn(&Theme) -> NewTheme,
Renderer: crate::core::Renderer,
{
content: Element<'a, Message, NewTheme, Renderer>,
to_theme: F,
text_color: Option<fn(&NewTheme) -> Color>,
background: Option<fn(&NewTheme) -> Background>,
old_theme: PhantomData<Theme>,
content: Element<'a, Message, Theme, Renderer>,
theme: Theme,
text_color: Option<fn(&Theme) -> Color>,
background: Option<fn(&Theme) -> Background>,
}
impl<'a, Message, Theme, NewTheme, F, Renderer>
Themer<'a, Message, Theme, NewTheme, F, Renderer>
impl<'a, Message, Theme, Renderer> Themer<'a, Message, Theme, Renderer>
where
F: Fn(&Theme) -> NewTheme,
Renderer: crate::core::Renderer,
{
/// Creates an empty [`Themer`] that applies the given `Theme`
/// to the provided `content`.
pub fn new<T>(to_theme: F, content: T) -> Self
where
T: Into<Element<'a, Message, NewTheme, Renderer>>,
{
pub fn new(
theme: Theme,
content: impl Into<Element<'a, Message, Theme, Renderer>>,
) -> Self {
Self {
content: content.into(),
to_theme,
theme,
text_color: None,
background: None,
old_theme: PhantomData,
}
}
/// Sets the default text [`Color`] of the [`Themer`].
pub fn text_color(mut self, f: fn(&NewTheme) -> Color) -> Self {
pub fn text_color(mut self, f: fn(&Theme) -> Color) -> Self {
self.text_color = Some(f);
self
}
/// Sets the [`Background`] of the [`Themer`].
pub fn background(mut self, f: fn(&NewTheme) -> Background) -> Self {
pub fn background(mut self, f: fn(&Theme) -> Background) -> Self {
self.background = Some(f);
self
}
}
impl<Message, Theme, NewTheme, F, Renderer> Widget<Message, Theme, Renderer>
for Themer<'_, Message, Theme, NewTheme, F, Renderer>
impl<Message, Theme, Renderer, AnyTheme> Widget<Message, AnyTheme, Renderer>
for Themer<'_, Message, Theme, Renderer>
where
F: Fn(&Theme) -> NewTheme,
Renderer: crate::core::Renderer,
{
fn tag(&self) -> tree::Tag {
@ -143,19 +135,17 @@ where
&self,
tree: &Tree,
renderer: &mut Renderer,
theme: &Theme,
_theme: &AnyTheme,
style: &renderer::Style,
layout: Layout<'_>,
cursor: mouse::Cursor,
viewport: &Rectangle,
) {
let theme = (self.to_theme)(theme);
if let Some(background) = self.background {
container::draw_background(
renderer,
&container::Style {
background: Some(background(&theme)),
background: Some(background(&self.theme)),
..container::Style::default()
},
layout.bounds(),
@ -164,15 +154,21 @@ where
let style = if let Some(text_color) = self.text_color {
renderer::Style {
text_color: text_color(&theme),
text_color: text_color(&self.theme),
}
} else {
*style
};
self.content
.as_widget()
.draw(tree, renderer, &theme, &style, layout, cursor, viewport);
self.content.as_widget().draw(
tree,
renderer,
&self.theme,
&style,
layout,
cursor,
viewport,
);
}
fn overlay<'b>(
@ -182,15 +178,15 @@ where
renderer: &Renderer,
viewport: &Rectangle,
translation: Vector,
) -> Option<overlay::Element<'b, Message, Theme, Renderer>> {
struct Overlay<'a, Message, Theme, NewTheme, Renderer> {
to_theme: &'a dyn Fn(&Theme) -> NewTheme,
content: overlay::Element<'a, Message, NewTheme, Renderer>,
) -> Option<overlay::Element<'b, Message, AnyTheme, Renderer>> {
struct Overlay<'a, Message, Theme, Renderer> {
theme: &'a Theme,
content: overlay::Element<'a, Message, Theme, Renderer>,
}
impl<Message, Theme, NewTheme, Renderer>
overlay::Overlay<Message, Theme, Renderer>
for Overlay<'_, Message, Theme, NewTheme, Renderer>
impl<Message, Theme, Renderer, AnyTheme>
overlay::Overlay<Message, AnyTheme, Renderer>
for Overlay<'_, Message, Theme, Renderer>
where
Renderer: crate::core::Renderer,
{
@ -205,14 +201,14 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Theme,
_theme: &AnyTheme,
style: &renderer::Style,
layout: Layout<'_>,
cursor: mouse::Cursor,
) {
self.content.as_overlay().draw(
renderer,
&(self.to_theme)(theme),
&self.theme,
style,
layout,
cursor,
@ -259,13 +255,13 @@ where
&'b mut self,
layout: Layout<'b>,
renderer: &Renderer,
) -> Option<overlay::Element<'b, Message, Theme, Renderer>>
) -> Option<overlay::Element<'b, Message, AnyTheme, Renderer>>
{
self.content
.as_overlay_mut()
.overlay(layout, renderer)
.map(|content| Overlay {
to_theme: &self.to_theme,
theme: self.theme,
content,
})
.map(|overlay| overlay::Element::new(Box::new(overlay)))
@ -276,26 +272,24 @@ where
.as_widget_mut()
.overlay(tree, layout, renderer, viewport, translation)
.map(|content| Overlay {
to_theme: &self.to_theme,
theme: &self.theme,
content,
})
.map(|overlay| overlay::Element::new(Box::new(overlay)))
}
}
impl<'a, Message, Theme, NewTheme, F, Renderer>
From<Themer<'a, Message, Theme, NewTheme, F, Renderer>>
for Element<'a, Message, Theme, Renderer>
impl<'a, Message, Theme, Renderer, AnyTheme>
From<Themer<'a, Message, Theme, Renderer>>
for Element<'a, Message, AnyTheme, Renderer>
where
Message: 'a,
Theme: 'a,
NewTheme: 'a,
F: Fn(&Theme) -> NewTheme + 'a,
Renderer: 'a + crate::core::Renderer,
{
fn from(
themer: Themer<'a, Message, Theme, NewTheme, F, Renderer>,
) -> Element<'a, Message, Theme, Renderer> {
themer: Themer<'a, Message, Theme, Renderer>,
) -> Element<'a, Message, AnyTheme, Renderer> {
Element::new(themer)
}
}