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

fix(segmented_button): text bounds off when an icon is used

Browse source
This commit is contained in:
Michael Aaron Murphy 2024-01-23 22:40:12 +01:00
parent ca92049ab6
commit d6e23fe977
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/widget/segmented_button/widget.rs
View file

@ -909,15 +909,12 @@ where
// Draw the image beside the text. // Draw the image beside the text.
let horizontal_alignment = if let Some(icon) = self.model.icon(key) { let horizontal_alignment = if let Some(icon) = self.model.icon(key) {
bounds.x += f32::from(self.button_padding[0]); bounds.x += f32::from(self.button_padding[0]);
bounds.y += f32::from(self.button_padding[1]);
bounds.width -=
f32::from(self.button_padding[0]) - f32::from(self.button_padding[2]);
bounds.height -=
f32::from(self.button_padding[1]) - f32::from(self.button_padding[3]);
let mut image_bounds = bounds;
let width = f32::from(icon.size); let width = f32::from(icon.size);
let offset = width + f32::from(self.button_spacing); let offset = width + f32::from(self.button_spacing);
bounds.y = y - width / 2.0; image_bounds.y += f32::from(self.button_padding[1]);
image_bounds.y = y - width / 2.0;
draw_icon::<Message>( draw_icon::<Message>(
renderer, renderer,
@ -929,7 +926,7 @@ where
Rectangle { Rectangle {
width, width,
height: width, height: width,
..bounds ..image_bounds
}, },
icon.clone(), icon.clone(),
); );
@ -973,7 +970,7 @@ where
bounds.position(), bounds.position(),
status_appearance.text_color, status_appearance.text_color,
Rectangle { Rectangle {
width: bounds.width - close_icon_width - 12.0, width: bounds.width - close_icon_width,
..original_bounds ..original_bounds
}, },
); );