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

Do not require Copy for text StyleSheet::Style

Browse source 
For most widgets, `Style` only requires `Default`. A few require
`Clone`. Only this one requires `Copy`.

Some of the types in the default theme has a custom variant requiring
`Box<dyn Trait>`, or `Rc<dyn Trait>` to provide `Clone`, but this isn't
possible if `Copy` is required.

It would be good to also address the inconsistency of requiring `Clone`
in some places and not others.

This removes `style/src/text.rs` which is unused in this branch and thus
confusing. If there's a reason to keep it, that can be removed from the
change.
This commit is contained in:
Ian Douglas Scott 2023-04-27 15:36:45 -07:00
parent c31ab8eee6
commit 47016a37df
2 changed files with 3 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/src/widget/text.rs
View file

@ -153,7 +153,7 @@ where
&self.content,
self.size,
self.font,
theme.appearance(self.style),
theme.appearance(self.style.clone()),
self.horizontal_alignment,
self.vertical_alignment,
);
@ -233,7 +233,7 @@ where
horizontal_alignment: self.horizontal_alignment,
vertical_alignment: self.vertical_alignment,
font: self.font,
style: self.style,
style: self.style.clone(),
}
}
}
@ -261,7 +261,7 @@ where
/// The style sheet of some text.
pub trait StyleSheet {
/// The supported style of the [`StyleSheet`].
type Style: Default + Copy;
type Style: Default + Clone;
/// Produces the [`Appearance`] of some text.
fn appearance(&self, style: Self::Style) -> Appearance;

20
style/src/text.rs
View file

@ -1,20 +0,0 @@
//! Change the appearance of text.
use crate::core::Color;
/// The style sheet of some text.
pub trait StyleSheet {
/// The supported style of the [`StyleSheet`].
type Style: Default + Copy;
/// Produces the [`Appearance`] of some text.
fn appearance(&self, style: Self::Style) -> Appearance;
}
/// The apperance of some text.
#[derive(Debug, Clone, Copy, Default)]
pub struct Appearance {
/// The [`Color`] of the text.
///
/// The default, `None`, means using the inherited color.
pub color: Option<Color>,
}