Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Placeholders to PickList #888

Merged
merged 6 commits into from
Jul 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/game_of_life/src/style.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ impl pick_list::StyleSheet for PickList {
},
border_radius: 2.0,
icon_size: 0.5,
..pick_list::Style::default()
}
}

Expand Down
9 changes: 5 additions & 4 deletions examples/pick_list/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pub fn main() -> iced::Result {
struct Example {
scroll: scrollable::State,
pick_list: pick_list::State<Language>,
selected_language: Language,
selected_language: Option<Language>,
}

#[derive(Debug, Clone, Copy)]
Expand All @@ -33,7 +33,7 @@ impl Sandbox for Example {
fn update(&mut self, message: Message) {
match message {
Message::LanguageSelected(language) => {
self.selected_language = language;
self.selected_language = Some(language);
}
}
}
Expand All @@ -42,9 +42,10 @@ impl Sandbox for Example {
let pick_list = PickList::new(
&mut self.pick_list,
&Language::ALL[..],
Some(self.selected_language),
self.selected_language,
Message::LanguageSelected,
);
)
.placeholder("Choose a language...");

let mut content = Scrollable::new(&mut self.scroll)
.width(Length::Fill)
Expand Down
10 changes: 8 additions & 2 deletions graphics/src/widget/pick_list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@ where
bounds: Rectangle,
cursor_position: Point,
selected: Option<String>,
placeholder: Option<&str>,
padding: Padding,
text_size: u16,
font: Font,
style: &Box<dyn StyleSheet>,
) -> Self::Output {
let is_mouse_over = bounds.contains(cursor_position);
let is_selected = selected.is_some();

let style = if is_mouse_over {
style.hovered()
Expand Down Expand Up @@ -68,12 +70,16 @@ where

(
Primitive::Group {
primitives: if let Some(label) = selected {
primitives: if let Some(label) =
selected.or_else(|| placeholder.map(str::to_string))
{
let label = Primitive::Text {
content: label,
size: f32::from(text_size),
font,
color: style.text_color,
color: is_selected
.then(|| style.text_color)
.unwrap_or(style.placeholder_color),
bounds: Rectangle {
x: bounds.x + f32::from(padding.left),
y: bounds.center_y(),
Expand Down
48 changes: 35 additions & 13 deletions native/src/widget/pick_list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ where
last_selection: &'a mut Option<T>,
on_selected: Box<dyn Fn(T) -> Message>,
options: Cow<'a, [T]>,
placeholder: Option<String>,
selected: Option<T>,
width: Length,
padding: Padding,
Expand Down Expand Up @@ -82,6 +83,7 @@ where
last_selection,
on_selected: Box::new(on_selected),
options: options.into(),
placeholder: None,
selected,
width: Length::Shrink,
text_size: None,
Expand All @@ -91,6 +93,12 @@ where
}
}

/// Sets the placeholder of the [`PickList`].
pub fn placeholder(mut self, placeholder: impl Into<String>) -> Self {
self.placeholder = Some(placeholder.into());
self
}

/// Sets the width of the [`PickList`].
pub fn width(mut self, width: Length) -> Self {
self.width = width;
Expand Down Expand Up @@ -154,24 +162,34 @@ where
.pad(self.padding);

let text_size = self.text_size.unwrap_or(renderer.default_size());
let font = self.font;

let max_width = match self.width {
Length::Shrink => {
let measure = |label: &str| -> u32 {
let (width, _) = renderer.measure(
label,
text_size,
font,
Size::new(f32::INFINITY, f32::INFINITY),
);

width.round() as u32
};

let labels = self.options.iter().map(ToString::to_string);

labels
.map(|label| {
let (width, _) = renderer.measure(
&label,
text_size,
self.font,
Size::new(f32::INFINITY, f32::INFINITY),
);

width.round() as u32
})
.max()
.unwrap_or(100)
let labels_width =
labels.map(|label| measure(&label)).max().unwrap_or(100);

let placeholder_width = self
.placeholder
.as_ref()
.map(String::as_str)
.map(measure)
.unwrap_or(100);

labels_width.max(placeholder_width)
}
_ => 0,
};
Expand All @@ -195,6 +213,8 @@ where

match self.width {
Length::Shrink => {
self.placeholder.hash(state);

self.options
.iter()
.map(ToString::to_string)
Expand Down Expand Up @@ -265,6 +285,7 @@ where
layout.bounds(),
cursor_position,
self.selected.as_ref().map(ToString::to_string),
self.placeholder.as_ref().map(String::as_str),
self.padding,
self.text_size.unwrap_or(renderer.default_size()),
self.font,
Expand Down Expand Up @@ -325,6 +346,7 @@ pub trait Renderer: text::Renderer + menu::Renderer {
bounds: Rectangle,
cursor_position: Point,
selected: Option<String>,
placeholder: Option<&str>,
padding: Padding,
text_size: u16,
font: Self::Font,
Expand Down
2 changes: 2 additions & 0 deletions style/src/pick_list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use iced_core::{Background, Color};
#[derive(Debug, Clone, Copy)]
pub struct Style {
pub text_color: Color,
pub placeholder_color: Color,
pub background: Background,
pub border_radius: f32,
pub border_width: f32,
Expand All @@ -16,6 +17,7 @@ impl std::default::Default for Style {
fn default() -> Self {
Self {
text_color: Color::BLACK,
placeholder_color: [0.4, 0.4, 0.4].into(),
background: Background::Color([0.87, 0.87, 0.87].into()),
border_radius: 0.0,
border_width: 1.0,
Expand Down