Add ability to set tab icon position for tab widget. Also fixed the r…

…ight icon position
iced-rs · Dec 27, 2023 · 205d4d9 · 205d4d9
1 parent bc9e78f
commit 205d4d9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/examples/tabs/src/main.rs b/examples/tabs/src/main.rs
@@ -150,7 +150,7 @@ impl Application for TabBarExample {
                     .clone()
                     .unwrap_or_default();
 
-                Tabs::new(Message::TabSelected)
+                Tabs::new(Message::TabSelected).tab_icon_position(iced_aw::tabs::Position::Bottom)
                     .push(
                         TabId::Login,
                         state.login_tab.tab_label(),

diff --git a/src/native/tab_bar.rs b/src/native/tab_bar.rs
@@ -424,15 +424,15 @@ where
                                         column = column.push(
                                             Row::new()
                                                 .align_items(Alignment::Center)
-                                                .push(layout_icon(
-                                                    icon,
-                                                    self.icon_size + 1.0,
-                                                    self.font,
-                                                ))
                                                 .push(layout_text(
                                                     text,
                                                     self.text_size + 1.0,
                                                     self.text_font,
+                                                ))
+                                                .push(layout_icon(
+                                                    icon,
+                                                    self.icon_size + 1.0,
+                                                    self.font,
                                                 )),
                                         );
                                     }

diff --git a/src/native/tabs.rs b/src/native/tabs.rs
@@ -8,6 +8,7 @@
 
 pub mod tab_bar_position;
 use crate::{native::tab_bar::TabBar, style::tab_bar::StyleSheet, TabLabel};
+pub use crate::tab_bar::Position;
 
 use iced_widget::{
     core::{
@@ -69,6 +70,8 @@ where
     indices: Vec<TabId>,
     /// The position of the [`TabBar`](crate::native::TabBar).
     tab_bar_position: TabBarPosition,
+    /// The position of the [`TabBar`](crate::native::TabBar) Icon.
+    tab_icon_position: Position,
     /// the width of the [`Tabs`].
     width: Length,
     /// The height of the [`Tabs`].
@@ -126,6 +129,7 @@ where
             tabs: elements,
             indices,
             tab_bar_position: TabBarPosition::Top,
+            tab_icon_position: Position::Left,
             width: Length::Fill,
             height: Length::Shrink,
         }
@@ -140,6 +144,15 @@ where
         self
     }
 
+    /// Sets the Tabs Icon render Position
+    /// [`TabLabel`](super::tab_bar::TabLabel) of the
+    /// [`TabBar`](super::tab_bar::TabBar).
+    #[must_use]
+    pub fn tab_icon_position(mut self, position: Position) -> Self {
+        self.tab_icon_position = position;
+        self
+    }
+
     /// Sets the height of the [`Tabs`].
     #[must_use]
     pub fn height(mut self, height: Length) -> Self {
@@ -184,7 +197,7 @@ where
     where
         E: Into<Element<'a, Message, Renderer>>,
     {
-        self.tab_bar = self.tab_bar.push(id.clone(), tab_label);
+        self.tab_bar = self.tab_bar.push(id.clone(), tab_label).set_position(self.tab_icon_position);
         self.tabs.push(element.into());
         self.indices.push(id);
         self