From bc9e78f09a938bd49c647ea5f74d60c7ce039c29 Mon Sep 17 00:00:00 2001 From: genusistimelord Date: Wed, 27 Dec 2023 11:50:49 -0500 Subject: [PATCH] fix tab bar left rendering with icon --- src/native/tab_bar.rs | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/native/tab_bar.rs b/src/native/tab_bar.rs index bdab406d..e6150ff9 100644 --- a/src/native/tab_bar.rs +++ b/src/native/tab_bar.rs @@ -367,8 +367,9 @@ where .size(size) .font(font.unwrap_or_default()) .horizontal_alignment(alignment::Horizontal::Center) - .vertical_alignment(alignment::Vertical::Bottom) + .vertical_alignment(alignment::Vertical::Center) .shaping(text::Shaping::Advanced) + .width(Length::Shrink) } fn layout_text(text: &str, size: f32, font: Option) -> Text<'_, Renderer> @@ -381,8 +382,9 @@ where .size(size) .font(font.unwrap_or_default()) .horizontal_alignment(alignment::Horizontal::Center) - .vertical_alignment(alignment::Vertical::Bottom) + .vertical_alignment(alignment::Vertical::Center) .shaping(text::Shaping::Advanced) + .width(Length::Shrink) } let row = self @@ -438,13 +440,13 @@ where column = column.push( Row::new() .align_items(Alignment::Center) - .push(layout_text( - text, + .push(layout_icon( + icon, self.icon_size + 1.0, self.font, )) - .push(layout_icon( - icon, + .push(layout_text( + text, self.text_size + 1.0, self.text_font, )), @@ -454,13 +456,13 @@ where column = column .push(layout_text( text, - self.icon_size + 1.0, - self.font, + self.text_size + 1.0, + self.text_font, )) .push(layout_icon( icon, - self.text_size + 1.0, - self.text_font, + self.icon_size + 1.0, + self.font, )); } }