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

Use char instead of String for pick_list::Icon

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-02-14 07:02:33 +01:00
parent 0272cac89e
commit bbff06b462
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
1 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
native/src/widget/pick_list.rs
View file

@ -329,25 +329,21 @@ impl<Font: Clone> Handle<Font> {
fn content<Renderer: text::Renderer<Font = Font>>( fn content<Renderer: text::Renderer<Font = Font>>(
&self, &self,
is_open: bool, is_open: bool,
) -> Option<(Font, String, Option<u16>)> { ) -> Option<(Font, char, Option<u16>)> {
match self { match self {
Self::Arrow { size } => Some(( Self::Arrow { size } => {
Renderer::ICON_FONT, Some((Renderer::ICON_FONT, Renderer::ARROW_DOWN_ICON, *size))
Renderer::ARROW_DOWN_ICON.to_string(),
*size,
)),
Self::Static(Icon { font, text, size }) => {
Some((font.clone(), text.clone(), *size))
} }
Self::Static(Icon {
font,
code_point,
size,
}) => Some((font.clone(), *code_point, *size)),
Self::Dynamic { open, closed } => { Self::Dynamic { open, closed } => {
if is_open { if is_open {
Some((open.font.clone(), open.text.clone(), open.size)) Some((open.font.clone(), open.code_point, open.size))
} else { } else {
Some(( Some((closed.font.clone(), closed.code_point, closed.size))
closed.font.clone(),
closed.text.clone(),
closed.size,
))
} }
} }
Self::None => None, Self::None => None,
@ -358,10 +354,10 @@ impl<Font: Clone> Handle<Font> {
/// The icon of a [`Handle`]. /// The icon of a [`Handle`].
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub struct Icon<Font> { pub struct Icon<Font> {
/// Font that will be used to display the `text`, /// Font that will be used to display the `code_point`,
pub font: Font, pub font: Font,
/// Text that will be shown. /// The unicode code point that will be used as the icon.
pub text: String, pub code_point: char,
/// Font size of the content. /// Font size of the content.
pub size: Option<u16>, pub size: Option<u16>,
} }
@ -624,12 +620,13 @@ pub fn draw<'a, T, Renderer>(
style.background, style.background,
); );
if let Some((font, text, size)) = handle.content::<Renderer>(state.is_open) if let Some((font, code_point, size)) =
handle.content::<Renderer>(state.is_open)
{ {
let size = f32::from(size.unwrap_or_else(|| renderer.default_size())); let size = f32::from(size.unwrap_or_else(|| renderer.default_size()));
renderer.fill_text(Text { renderer.fill_text(Text {
content: &text, content: &code_point.to_string(),
size, size,
font, font,
color: style.handle_color, color: style.handle_color,