feat: improve handling of list items using data in theme

Author: wash2

src/theme/mod.rs

@@ -7,6 +7,7 @@
 pub mod portal;
 pub mod style;
 
+use ::iced::Alignment;
 use cosmic_config::{CosmicConfigEntry, config_subscription};
 use cosmic_theme::{Component, LayeredTheme, Spacing, ThemeMode};
 use iced_futures::Subscription;
@@ -47,6 +48,7 @@ pub(crate) static THEME: Mutex<Theme> = Mutex::new(Theme {
     theme_type: ThemeType::Dark,
     layer: cosmic_theme::Layer::Background,
     transparent: false,
+    list_item_position: None,
 });
 
 /// Currently-defined theme.
@@ -83,34 +85,6 @@ pub fn is_high_contrast() -> bool {
     active_type().is_high_contrast()
 }
 
-// /// Watches for changes to the system's theme preference.
-// #[cold]
-// pub fn subscription(is_dark: bool) -> Subscription<crate::theme::Theme> {
-//     config_subscription::<_, crate::cosmic_theme::Theme>(
-//         (
-//             std::any::TypeId::of::<crate::cosmic_theme::Theme>(),
-//             is_dark,
-//         ),
-//         if is_dark {
-//             cosmic_theme::DARK_THEME_ID
-//         } else {
-//             cosmic_theme::LIGHT_THEME_ID
-//         }
-//         .into(),
-//         crate::cosmic_theme::Theme::VERSION,
-//     )
-//     .map(|res| {
-//         for error in res.errors.into_iter().filter(cosmic_config::Error::is_err) {
-//             tracing::error!(
-//                 ?error,
-//                 "error while watching system theme preference changes"
-//             );
-//         }
-
-//         Theme::system(Arc::new(res.config))
-//     })
-// }
-
 pub fn system_dark() -> Theme {
     let Ok(helper) = crate::cosmic_theme::Theme::dark_config() else {
         return Theme::dark();
@@ -211,6 +185,8 @@ pub struct Theme {
     pub theme_type: ThemeType,
     pub layer: cosmic_theme::Layer,
     pub transparent: bool,
+    /// Only meaningful for widgets that must be in a list. Otherwise it should be ignored.
+    pub list_item_position: Option<(Alignment, usize)>,
 }
 
 impl Theme {
@@ -281,9 +257,9 @@ impl Theme {
     /// can be used in a component that is intended to be a child of a `CosmicContainer`
     pub fn current_container(&self) -> &cosmic_theme::Container {
         match self.layer {
-            cosmic_theme::Layer::Background => &self.cosmic().background(self.transparent),
-            cosmic_theme::Layer::Primary => &self.cosmic().primary(self.transparent),
-            cosmic_theme::Layer::Secondary => &self.cosmic().secondary(self.transparent),
+            cosmic_theme::Layer::Background => self.cosmic().background(self.transparent),
+            cosmic_theme::Layer::Primary => self.cosmic().primary(self.transparent),
+            cosmic_theme::Layer::Secondary => self.cosmic().secondary(self.transparent),
         }
     }
 
@@ -292,6 +268,14 @@ impl Theme {
     pub fn set_theme(&mut self, theme: ThemeType) {
         self.theme_type = theme;
     }
+
+    #[inline]
+    /// Clone theme with a list position
+    pub fn with_list_item_position(&self, position: Option<(Alignment, usize)>) -> Self {
+        let mut new = self.clone();
+        new.list_item_position = position;
+        new
+    }
 }
 
 impl LayeredTheme for Theme {

src/widget/button/widget.rs

@@ -6,6 +6,7 @@
 //!
 //! A [`Button`] has some local [`State`].
 
+use iced::Alignment;
 use iced_runtime::core::widget::Id;
 use iced_runtime::{Action, Task, keyboard, task};
 
@@ -449,7 +450,7 @@ impl<'a, Message: 'a + Clone> Widget<Message, crate::Theme, crate::Renderer>
 
         let state = tree.state.downcast_ref::<State>();
 
-        let styling = if !is_enabled {
+        let mut styling = if !is_enabled {
             theme.disabled(&self.style)
         } else if is_mouse_over {
             if state.is_pressed {
@@ -471,6 +472,21 @@ impl<'a, Message: 'a + Clone> Widget<Message, crate::Theme, crate::Renderer>
 
             theme.active(state.is_focused, self.selected, &self.style)
         };
+        if matches!(self.style, crate::theme::Button::MenuItem) {
+            match theme.list_item_position {
+                Some((Alignment::Start, _)) => {
+                    styling.border_radius =
+                        styling.border_radius.bottom(theme.cosmic().radius_0()[3]);
+                }
+                Some((Alignment::End, _)) => {
+                    styling.border_radius = styling.border_radius.top(theme.cosmic().radius_0()[0]);
+                }
+                Some((Alignment::Center, _)) => {}
+                None => {
+                    styling.border_radius = theme.cosmic().radius_0().into();
+                }
+            };
+        }
 
         let mut icon_color = styling.icon_color.unwrap_or(renderer_style.icon_color);
 

src/widget/menu.rs

@@ -66,6 +66,8 @@ mod menu_bar;
 pub(crate) use menu_bar::MenuBarState;
 pub use menu_bar::{MenuBar, menu_bar as bar};
 
+pub mod menu_column;
+
 mod menu_inner;
 mod menu_tree;
 pub use menu_tree::{