Merge branch 'master' of https://github.com/Adam-Cosner/libcosmic

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<_, _, _>);
 

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<_, _, _>);
 

src/widget/header_bar.rs

@@ -299,7 +299,6 @@ impl<'a, Message: Clone + 'static> HeaderBar<'a, Message> {
         let mut end = std::mem::take(&mut self.end);
 
         // Also packs the window controls at the very end.
-        end.push(widget::horizontal_space().width(Length::Fixed(12.0)).into());
         end.push(self.window_controls());
 
         let height = match self.density.unwrap_or_else(crate::config::header_size) {

src/widget/nav_bar_toggle.rs

@@ -20,7 +20,7 @@ pub fn nav_bar_toggle<Message>() -> NavBarToggle<Message> {
     NavBarToggle {
         active: false,
         on_toggle: None,
-        class: crate::theme::Button::Text,
+        class: crate::theme::Button::NavToggle,
         selected: false,
     }
 }