fix(dropdown): styling

pop-os · Dec 25, 2024 · cbbab58 · cbbab58
1 parent 35552e0
commit cbbab58
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 43 deletions.
diff --git a/src/theme/style/iced.rs b/src/theme/style/iced.rs
@@ -536,20 +536,17 @@ impl iced_container::Catalog for Theme {
 
             Container::Secondary => Container::secondary(cosmic),
 
-            Container::Dropdown => {
-                let theme = self.cosmic();
-
-                iced_container::Style {
-                    icon_color: None,
-                    text_color: None,
-                    background: Some(iced::Background::Color(theme.primary.base.into())),
-                    border: Border {
-                        radius: cosmic.corner_radii.radius_xs.into(),
-                        ..Default::default()
-                    },
-                    shadow: Shadow::default(),
-                }
-            }
+            Container::Dropdown => iced_container::Style {
+                icon_color: None,
+                text_color: None,
+                background: Some(iced::Background::Color(cosmic.bg_component_color().into())),
+                border: Border {
+                    color: cosmic.bg_component_divider().into(),
+                    width: 1.0,
+                    radius: cosmic.corner_radii.radius_s.into(),
+                },
+                shadow: Shadow::default(),
+            },
 
             Container::Tooltip => iced_container::Style {
                 icon_color: None,

diff --git a/src/widget/dropdown/menu/mod.rs b/src/widget/dropdown/menu/mod.rs
@@ -156,21 +156,21 @@ impl<'a, Message: 'a> Overlay<'a, Message> {
             style,
         } = menu;
 
-        let mut container = Container::new(Scrollable::new(List {
-            options,
-            icons,
-            hovered_option,
-            selected_option,
-            on_selected,
-            on_option_hovered,
-            text_size,
-            text_line_height,
-            padding,
-        }));
-
-        container = container
-            .padding(padding)
-            .class(crate::style::Container::Dropdown);
+        let mut container = Container::new(Scrollable::new(
+            Container::new(List {
+                options,
+                icons,
+                hovered_option,
+                selected_option,
+                on_selected,
+                on_option_hovered,
+                text_size,
+                text_line_height,
+                padding,
+            })
+            .padding(padding),
+        ))
+        .class(crate::style::Container::Dropdown);
 
         state.tree.diff(&mut container as &mut dyn Widget<_, _, _>);
 

diff --git a/src/widget/dropdown/multi/menu.rs b/src/widget/dropdown/multi/menu.rs
@@ -152,20 +152,20 @@ impl<'a, Message: 'a> Overlay<'a, Message> {
             style,
         } = menu;
 
-        let mut container = Container::new(Scrollable::new(InnerList {
-            options,
-            hovered_option,
-            selected_option,
-            on_selected,
-            on_option_hovered,
-            padding,
-            text_size,
-            text_line_height,
-        }));
-
-        container = container
-            .padding(padding)
-            .class(crate::style::Container::Dropdown);
+        let mut container = Container::new(Scrollable::new(
+            Container::new(InnerList {
+                options,
+                hovered_option,
+                selected_option,
+                on_selected,
+                on_option_hovered,
+                padding,
+                text_size,
+                text_line_height,
+            })
+            .padding(padding),
+        ))
+        .class(crate::style::Container::Dropdown);
 
         state.tree.diff(&mut container as &mut dyn Widget<_, _, _>);