libcosmic updates

src/widget/layer_container.rs

@@ -1,3 +1,4 @@
+use crate::Theme;
 use cosmic_theme::LayeredTheme;
 use iced::widget::Container;
 use iced_core::alignment;
@@ -7,16 +8,14 @@ use iced_core::mouse;
 use iced_core::overlay;
 use iced_core::renderer;
 use iced_core::widget::Tree;
-use iced_core::{Clipboard, Element, Layout, Length, Padding, Rectangle, Shell, Widget};
-pub use iced_style::container::{Appearance, StyleSheet};
+use iced_core::{Clipboard, Element, Layout, Length, Padding, Rectangle, Shell, Vector, Widget};
+pub use iced_widget::container::{Catalog, Style};
 
-pub fn layer_container<'a, Message: 'static, Theme, E>(
+pub fn layer_container<'a, Message: 'static, E>(
     content: E,
-) -> LayerContainer<'a, Message, Theme, crate::Renderer>
+) -> LayerContainer<'a, Message, crate::Renderer>
 where
     E: Into<Element<'a, Message, Theme, crate::Renderer>>,
-    Theme: iced_style::container::StyleSheet + LayeredTheme,
-    <Theme as iced_widget::container::StyleSheet>::Style: From<crate::theme::Container>,
 {
     LayerContainer::new(content)
 }
@@ -25,20 +24,18 @@ where
 ///
 /// It is normally used for alignment purposes.
 #[allow(missing_debug_implementations)]
-pub struct LayerContainer<'a, Message, Theme, Renderer>
+pub struct LayerContainer<'a, Message, Renderer>
 where
     Renderer: iced_core::Renderer,
-    Theme: iced_style::container::StyleSheet + LayeredTheme,
 {
     layer: Option<cosmic_theme::Layer>,
     container: Container<'a, Message, Theme, Renderer>,
 }
 
-impl<'a, Message, Theme, Renderer> LayerContainer<'a, Message, Theme, Renderer>
+impl<'a, Message, Renderer> LayerContainer<'a, Message, Renderer>
 where
     Renderer: iced_core::Renderer,
-    Theme: iced_style::container::StyleSheet + LayeredTheme,
-    <Theme as iced_style::container::StyleSheet>::Style: From<crate::theme::Container>,
+    // iced_widget::container::Style: From<crate::theme::Container>,
 {
     /// Creates an empty [`Container`].
     pub(crate) fn new<T>(content: T) -> Self
@@ -55,7 +52,7 @@ where
     #[must_use]
     pub fn layer(mut self, layer: cosmic_theme::Layer) -> Self {
         self.layer = Some(layer);
-        self.style(match layer {
+        self.class(match layer {
             cosmic_theme::Layer::Background => crate::theme::Container::Background,
             cosmic_theme::Layer::Primary => crate::theme::Container::Primary,
             cosmic_theme::Layer::Secondary => crate::theme::Container::Secondary,
@@ -113,31 +110,30 @@ where
 
     /// Centers the contents in the horizontal axis of the [`LayerContainer`].
     #[must_use]
-    pub fn center_x(mut self) -> Self {
-        self.container = self.container.center_x();
+    pub fn center_x(mut self, width: Length) -> Self {
+        self.container = self.container.center_x(width);
         self
     }
 
     /// Centers the contents in the vertical axis of the [`LayerContainer`].
     #[must_use]
-    pub fn center_y(mut self) -> Self {
-        self.container = self.container.center_y();
+    pub fn center_y(mut self, height: Length) -> Self {
+        self.container = self.container.center_y(height);
         self
     }
 
     /// Sets the style of the [`LayerContainer`].
     #[must_use]
-    pub fn style(mut self, style: impl Into<<Theme as StyleSheet>::Style>) -> Self {
-        self.container = self.container.style(style);
+    pub fn class(mut self, style: impl Into<crate::style::iced::Container<'a>>) -> Self {
+        self.container = self.container.class(style);
         self
     }
 }
 
-impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer>
-    for LayerContainer<'a, Message, Theme, Renderer>
+impl<'a, Message, Renderer> Widget<Message, Theme, Renderer>
+    for LayerContainer<'a, Message, Renderer>
 where
     Renderer: iced_core::Renderer,
-    Theme: iced_style::container::StyleSheet + LayeredTheme + Clone,
 {
     fn children(&self) -> Vec<Tree> {
         self.container.children()
@@ -173,9 +169,7 @@ where
         tree: &mut Tree,
         layout: Layout<'_>,
         renderer: &Renderer,
-        operation: &mut dyn iced_core::widget::Operation<
-            iced_core::widget::OperationOutputWrapper<Message>,
-        >,
+        operation: &mut dyn iced_core::widget::Operation<()>,
     ) {
         self.container.operate(tree, layout, renderer, operation);
     }
@@ -232,6 +226,7 @@ where
         } else {
             theme.clone()
         };
+
         self.container.draw(
             tree,
             renderer,
@@ -248,8 +243,9 @@ where
         tree: &'b mut Tree,
         layout: Layout<'_>,
         renderer: &Renderer,
+        translation: Vector,
     ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> {
-        self.container.overlay(tree, layout, renderer)
+        self.container.overlay(tree, layout, renderer, translation)
     }
 
     fn drag_destinations(
@@ -257,7 +253,7 @@ where
         state: &Tree,
         layout: Layout<'_>,
         renderer: &Renderer,
-        dnd_rectangles: &mut iced_style::core::clipboard::DndDestinationRectangles,
+        dnd_rectangles: &mut iced_core::clipboard::DndDestinationRectangles,
     ) {
         self.container
             .drag_destinations(state, layout, renderer, dnd_rectangles);
@@ -272,15 +268,14 @@ where
     }
 }
 
-impl<'a, Message, Theme, Renderer> From<LayerContainer<'a, Message, Theme, Renderer>>
+impl<'a, Message, Renderer> From<LayerContainer<'a, Message, Renderer>>
     for Element<'a, Message, Theme, Renderer>
 where
     Message: 'a,
     Renderer: 'a + iced_core::Renderer,
-    Theme: iced_style::container::StyleSheet + LayeredTheme + 'a + Clone,
 {
     fn from(
-        column: LayerContainer<'a, Message, Theme, Renderer>,
+        column: LayerContainer<'a, Message, Renderer>,
     ) -> Element<'a, Message, Theme, Renderer> {
         Element::new(column)
     }