libcosmic updates

src/widget/context_drawer/overlay.rs

@@ -4,13 +4,14 @@
 use crate::Element;
 
 use iced::advanced::layout::{self, Layout};
-use iced::advanced::widget::{self, Operation, OperationOutputWrapper};
+use iced::advanced::widget::{self, Operation};
 use iced::advanced::{overlay, renderer};
 use iced::advanced::{Clipboard, Shell};
 use iced::{event, mouse, Event, Point, Rectangle, Size};
 use iced_core::Renderer;
 
 pub(super) struct Overlay<'a, 'b, Message> {
+    pub(crate) position: Point,
     pub(super) content: &'b mut Element<'a, Message>,
     pub(super) tree: &'b mut widget::Tree,
     pub(super) width: f32,
@@ -21,13 +22,8 @@ impl<'a, 'b, Message> overlay::Overlay<Message, crate::Theme, crate::Renderer>
 where
     Message: Clone,
 {
-    fn layout(
-        &mut self,
-        renderer: &crate::Renderer,
-        bounds: Size,
-        position: Point,
-        _translation: iced::Vector,
-    ) -> layout::Node {
+    fn layout(&mut self, renderer: &crate::Renderer, bounds: Size) -> layout::Node {
+        let position = self.position;
         let limits = layout::Limits::new(Size::ZERO, bounds)
             .width(self.width)
             .height(bounds.height - 8.0 - position.y);
@@ -98,7 +94,7 @@ where
         &mut self,
         layout: Layout<'_>,
         renderer: &crate::Renderer,
-        operation: &mut dyn Operation<OperationOutputWrapper<Message>>,
+        operation: &mut dyn Operation<()>,
     ) {
         self.content
             .as_widget_mut()
@@ -122,8 +118,9 @@ where
         layout: Layout<'_>,
         renderer: &crate::Renderer,
     ) -> Option<overlay::Element<'c, Message, crate::Theme, crate::Renderer>> {
+        let translation = iced::Vector::new(self.position.x, self.position.y);
         self.content
             .as_widget_mut()
-            .overlay(self.tree, layout, renderer)
+            .overlay(self.tree, layout, renderer, translation)
     }
 }

src/widget/context_drawer/widget.rs

@@ -13,11 +13,9 @@ use iced_core::event::{self, Event};
 use iced_core::widget::{Operation, Tree};
 use iced_core::{
     layout, mouse, overlay as iced_overlay, renderer, Clipboard, Layout, Length, Padding,
-    Rectangle, Shell, Widget,
+    Rectangle, Shell, Vector, Widget,
 };
 
-use iced_renderer::core::widget::OperationOutputWrapper;
-
 #[must_use]
 pub struct ContextDrawer<'a, Message> {
     id: Option<iced_core::widget::Id>,
@@ -48,19 +46,19 @@ impl<'a, Message: Clone + 'static> ContextDrawer<'a, Message> {
                 text::heading(header)
                     .width(Length::FillPortion(1))
                     .height(Length::Fill)
-                    .horizontal_alignment(alignment::Horizontal::Center)
-                    .vertical_alignment(alignment::Vertical::Center),
+                    .align_x(alignment::Horizontal::Center)
+                    .align_y(alignment::Vertical::Center),
             )
             .push(
                 button::text("Close")
                     .trailing_icon(icon::from_name("go-next-symbolic"))
                     .on_press(on_close)
-                    .style(crate::theme::Button::Link)
+                    .class(crate::theme::Button::Link)
                     .apply(container)
                     .width(Length::FillPortion(1))
                     .height(Length::Fill)
                     .align_x(alignment::Horizontal::Right)
-                    .center_y(),
+                    .center_y(Length::Fill),
             )
             // XXX must be done after pushing elements or it may be overwritten by size hints from contents
             .height(Length::Fixed(80.0))
@@ -84,7 +82,7 @@ impl<'a, Message: Clone + 'static> ContextDrawer<'a, Message> {
         container(
             LayerContainer::new(pane)
                 .layer(cosmic_theme::Layer::Primary)
-                .style(crate::style::Container::ContextDrawer)
+                .class(crate::style::Container::ContextDrawer)
                 .width(Length::Fill)
                 .height(Length::Fill)
                 .max_width(max_width),
@@ -159,7 +157,7 @@ impl<'a, Message: Clone> Widget<Message, crate::Theme, Renderer> for ContextDraw
         tree: &mut Tree,
         layout: Layout<'_>,
         renderer: &Renderer,
-        operation: &mut dyn Operation<OperationOutputWrapper<Message>>,
+        operation: &mut dyn Operation<()>,
     ) {
         self.content
             .as_widget()
@@ -232,17 +230,20 @@ impl<'a, Message: Clone> Widget<Message, crate::Theme, Renderer> for ContextDraw
         tree: &'b mut Tree,
         layout: Layout<'_>,
         _renderer: &Renderer,
+        translation: Vector,
     ) -> Option<iced_overlay::Element<'b, Message, crate::Theme, Renderer>> {
         let bounds = layout.bounds();
 
-        Some(iced_overlay::Element::new(
-            layout.position(),
-            Box::new(Overlay {
-                content: &mut self.drawer,
-                tree: &mut tree.children[1],
-                width: bounds.width,
-            }),
-        ))
+        let mut position = layout.position();
+        position.x += translation.x;
+        position.y += translation.y;
+
+        Some(iced_overlay::Element::new(Box::new(Overlay {
+            content: &mut self.drawer,
+            tree: &mut tree.children[1],
+            width: bounds.width,
+            position,
+        })))
     }
 
     #[cfg(feature = "a11y")]