Merge remote-tracking branch 'upstream/master' into drawer

Cargo.toml

@@ -11,6 +11,8 @@ name = "cosmic"
 default = ["multi-window"]
 # Accessibility support
 a11y = ["iced/a11y", "iced_accessibility"]
+# Enable about widget
+about = ["desktop", "dep:license"]
 # Builds support for animated images
 animated-image = ["image", "dep:async-fs", "tokio?/io-util", "tokio?/fs"]
 # XXX autosize should not be used on winit windows unless dialogs
@@ -40,7 +42,6 @@ desktop = [
     "process",
     "dep:freedesktop-desktop-entry",
     "dep:mime",
-    "dep:license",
     "dep:shlex",
     "tokio?/io-util",
     "tokio?/net",

src/widget/about.rs

@@ -1,4 +1,3 @@
-#[cfg(feature = "desktop")]
 use {
     crate::{
         iced::{Alignment, Length},

src/widget/list/column.rs

@@ -42,7 +42,7 @@ impl<'a, Message: 'static> ListColumn<'a, Message> {
 
         // Ensure a minimum height of 32.
         let list_item = iced::widget::row![
-            item.into(),
+            crate::widget::container(item).align_y(iced::Alignment::Center),
             crate::widget::vertical_space().height(iced::Length::Fixed(32.))
         ]
         .align_y(iced::Alignment::Center);

src/widget/mod.rs

@@ -366,8 +366,8 @@ pub use warning::*;
 #[doc(inline)]
 pub use iced::widget::markdown;
 
-#[cfg(feature = "desktop")]
+#[cfg(feature = "about")]
 pub mod about;
-#[cfg(feature = "desktop")]
+#[cfg(feature = "about")]
 #[doc(inline)]
 pub use about::about;