leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(dropdown::multi): set correct line height for descriptions

Browse source
This commit is contained in:
Michael Aaron Murphy 2023-12-05 16:17:06 +01:00 • committed by Michael Murphy
parent 93cee0abab
commit 2cffbaf3a7
1 changed files with 20 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/widget/dropdown/multi/widget.rs
View file

@ -382,6 +382,10 @@ pub fn overlay<'a, S: AsRef<str>, Message: 'a, Item: Clone + PartialEq + 'static
on_selected: &'a dyn Fn(Item) -> Message, on_selected: &'a dyn Fn(Item) -> Message,
) -> Option<overlay::Element<'a, Message, crate::Renderer>> { ) -> Option<overlay::Element<'a, Message, crate::Renderer>> {
if state.is_open { if state.is_open {
let description_line_height = text::LineHeight::Absolute(Pixels(
text_line_height.to_absolute(Pixels(text_size)).0 + 4.0,
));
let bounds = layout.bounds(); let bounds = layout.bounds();
let menu = Menu::new( let menu = Menu::new(
@ -397,33 +401,20 @@ pub fn overlay<'a, S: AsRef<str>, Message: 'a, Item: Clone + PartialEq + 'static
None, None,
) )
.width({ .width({
let measure = |label: &str, paragraph: &mut crate::Paragraph| { let measure =
paragraph.update(Text { |label: &str, paragraph: &mut crate::Paragraph, line_height: text::LineHeight| {
content: label, paragraph.update(Text {
bounds: Size::new(f32::MAX, f32::MAX), content: label,
size: iced::Pixels(text_size), bounds: Size::new(f32::MAX, f32::MAX),
line_height: text_line_height, size: iced::Pixels(text_size),
font: font.unwrap_or_else(|| text::Renderer::default_font(renderer)), line_height,
horizontal_alignment: alignment::Horizontal::Left, font: font.unwrap_or_else(|| text::Renderer::default_font(renderer)),
vertical_alignment: alignment::Vertical::Top, horizontal_alignment: alignment::Horizontal::Left,
shaping: text::Shaping::Advanced, vertical_alignment: alignment::Vertical::Top,
}); shaping: text::Shaping::Advanced,
paragraph.min_width().round() });
}; paragraph.min_width().round()
};
let measure_description = |label: &str, paragraph: &mut crate::Paragraph| {
paragraph.update(Text {
content: label,
bounds: Size::new(f32::MAX, f32::MAX),
size: iced::Pixels(text_size + 4.0),
line_height: text_line_height,
font: font.unwrap_or_else(|| text::Renderer::default_font(renderer)),
horizontal_alignment: alignment::Horizontal::Left,
vertical_alignment: alignment::Vertical::Top,
shaping: text::Shaping::Advanced,
});
paragraph.min_width().round()
};
let mut desc_count = 0; let mut desc_count = 0;
selections selections
@ -437,7 +428,7 @@ pub fn overlay<'a, S: AsRef<str>, Message: 'a, Item: Clone + PartialEq + 'static
state.descriptions.last_mut().unwrap() state.descriptions.last_mut().unwrap()
}; };
desc_count += 1; desc_count += 1;
measure_description(desc.as_ref(), paragraph) measure(desc.as_ref(), paragraph, description_line_height)
} }
super::menu::OptionElement::Option((option, item)) => { super::menu::OptionElement::Option((option, item)) => {
@ -451,7 +442,7 @@ pub fn overlay<'a, S: AsRef<str>, Message: 'a, Item: Clone + PartialEq + 'static
.push((item.clone(), crate::Paragraph::new())); .push((item.clone(), crate::Paragraph::new()));
&mut state.selections.last_mut().unwrap().1 &mut state.selections.last_mut().unwrap().1
}; };
measure(option.as_ref(), paragraph) measure(option.as_ref(), paragraph, text_line_height)
} }
super::menu::OptionElement::Separator => 1.0, super::menu::OptionElement::Separator => 1.0,