Update overlay code to compile with iced master

examples/grid/src/main.rs

@@ -86,11 +86,11 @@ impl Sandbox for App {
  let col_spacing_slider =
  slider(0.0..=100.0, self.column_spacing, Message::ColumnSpacing).width(Length::Fill);
 
- let debug_mode_check = checkbox("", self.debug_layout, Message::DebugToggled);
+ let debug_mode_check = checkbox("", self.debug_layout).on_toggle(Message::DebugToggled);
 
  let fill_checkboxes = row![
- checkbox("Width", self.fill_width, Message::FillWidth),
- checkbox("Height", self.fill_height, Message::FillHeight)
+ checkbox("Width", self.fill_width).on_toggle(Message::FillWidth),
+ checkbox("Height", self.fill_height).on_toggle(Message::FillHeight)
  ]
  .spacing(10);
 

src/native/card.rs

@@ -14,7 +14,7 @@ use iced_widget::{
  renderer, touch,
  widget::{Operation, Tree},
  Alignment, Border, Clipboard, Color, Element, Event, Layout, Length, Padding, Pixels,
- Point, Rectangle, Shadow, Shell, Size, Widget,
+ Point, Rectangle, Shadow, Shell, Size, Vector, Widget,
  },
  text::LineHeight,
 };
@@ -583,6 +583,7 @@ where
  tree: &'b mut Tree,
  layout: Layout<'_>,
  renderer: &Renderer,
+ translation: Vector,
  ) -> Option<core::overlay::Element<'b, Message, Theme, Renderer>> {
  let mut children = vec![&mut self.head, &mut self.body];
  if let Some(foot) = &mut self.foot {
@@ -594,7 +595,9 @@ where
  .zip(layout.children())
  .filter_map(|((child, state), layout)| {
  layout.children().next().and_then(|child_layout| {
- child.as_widget_mut().overlay(state, child_layout, renderer)
+ child
+ .as_widget_mut()
+ .overlay(state, child_layout, renderer, translation)
  })
  })
  .collect::<Vec<_>>();

src/native/color_picker.rs

@@ -17,7 +17,7 @@ use iced_widget::{
  self,
  tree::{self, Tag, Tree},
  },
- Clipboard, Color, Element, Event, Layout, Length, Point, Rectangle, Shell, Widget,
+ Clipboard, Color, Element, Event, Layout, Length, Point, Rectangle, Shell, Vector, Widget,
  },
  renderer::Renderer,
 };
@@ -242,14 +242,17 @@ where
  state: &'b mut Tree,
  layout: Layout<'_>,
  renderer: &Renderer,
+ translation: Vector,
  ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> {
  let picker_state: &mut State = state.state.downcast_mut();
 
  if !self.show_picker {
- return self
- .underlay
- .as_widget_mut()
- .overlay(&mut state.children[0], layout, renderer);
+ return self.underlay.as_widget_mut().overlay(
+ &mut state.children[0],
+ layout,
+ renderer,
+ translation,
+ );
  }
 
  let bounds = layout.bounds();

src/native/context_menu.rs

@@ -6,7 +6,7 @@ use iced_widget::core::{
  mouse::{self, Button, Cursor},
  overlay, renderer,
  widget::{tree, Operation, Tree},
- Clipboard, Element, Event, Layout, Length, Point, Rectangle, Shell, Widget,
+ Clipboard, Element, Event, Layout, Length, Point, Rectangle, Shell, Vector, Widget,
 };
 
 use crate::native::overlay::ContextMenuOverlay;
@@ -218,23 +218,31 @@ where
  state: &'b mut Tree,
  layout: Layout<'_>,
  renderer: &Renderer,
+ translation: Vector,
  ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> {
  let s: &mut State = state.state.downcast_mut();
 
  if !s.show {
- return self
- .underlay
- .as_widget_mut()
- .overlay(&mut state.children[0], layout, renderer);
+ return self.underlay.as_widget_mut().overlay(
+ &mut state.children[0],
+ layout,
+ renderer,
+ translation,
+ );
  }
 
  let position = s.cursor_position;
  let content = (self.overlay)();
  content.as_widget().diff(&mut state.children[1]);
-
  Some(
- ContextMenuOverlay::new(&mut state.children[1], content, self.style.clone(), s)
- .overlay(position),
+ ContextMenuOverlay::new(
+ position + translation,
+ &mut state.children[1],
+ content,
+ self.style.clone(),
+ s,
+ )
+ .overlay(),
  )
  }
 }

src/native/date_picker.rs

@@ -16,7 +16,7 @@ use iced_widget::{
  self,
  tree::{Tag, Tree},
  },
- Clipboard, Element, Event, Layout, Length, Point, Rectangle, Shell, Widget,
+ Clipboard, Element, Event, Layout, Length, Point, Rectangle, Shell, Vector, Widget,
  },
  renderer::Renderer,
  text,
@@ -249,14 +249,17 @@ where
  state: &'b mut Tree,
  layout: Layout<'_>,
  renderer: &Renderer,
+ translation: Vector,
  ) -> Option<core::overlay::Element<'b, Message, Theme, Renderer>> {
  let picker_state: &mut State = state.state.downcast_mut();
 
  if !self.show_picker {
- return self
- .underlay
- .as_widget_mut()
- .overlay(&mut state.children[0], layout, renderer);
+ return self.underlay.as_widget_mut().overlay(
+ &mut state.children[0],
+ layout,
+ renderer,
+ translation,
+ );
  }
 
  let bounds = layout.bounds();

src/native/floating_element.rs

@@ -10,7 +10,7 @@ use iced_widget::core::{
  mouse::{self, Cursor},
  overlay, renderer,
  widget::{Operation, Tree},
- Clipboard, Element, Event, Layout, Length, Rectangle, Shell, Widget,
+ Clipboard, Element, Event, Layout, Length, Rectangle, Shell, Vector, Widget,
 };
 
 pub mod anchor;
@@ -211,27 +211,30 @@ where
  state: &'b mut Tree,
  layout: Layout<'_>,
  renderer: &Renderer,
+ translation: Vector,
  ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> {
  if self.hidden {
- return self
- .underlay
- .as_widget_mut()
- .overlay(&mut state.children[0], layout, renderer);
+ return self.underlay.as_widget_mut().overlay(
+ &mut state.children[0],
+ layout,
+ renderer,
+ translation,
+ );
  }
 
  if state.children.len() == 2 {
  let bounds = layout.bounds();
 
- Some(overlay::Element::new(
- bounds.position(),
- Box::new(FloatingElementOverlay::new(
+ Some(overlay::Element::new(Box::new(
+ FloatingElementOverlay::new(
+  layout.position() + translation,
  &mut state.children[1],
  &mut self.element,
  &self.anchor,
  &self.offset,
  bounds,
- )),
- ))
+ ),
+ )))
  } else {
  None
  }

src/native/grid/widget.rs

@@ -5,7 +5,7 @@ use iced_widget::core::{
  overlay::Group,
  renderer::Style,
  widget::{Operation, Tree},
- Clipboard, Element, Event, Layout, Length, Rectangle, Shell, Size, Widget,
+ Clipboard, Element, Event, Layout, Length, Rectangle, Shell, Size, Vector, Widget,
 };
 
 use super::{layout::layout, types::Grid};
@@ -159,13 +159,16 @@ where
  tree: &'b mut Tree,
  layout: Layout<'_>,
  renderer: &Renderer,
+ translation: Vector,
  ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> {
  let children = self
  .elements_iter_mut()
  .zip(&mut tree.children)
  .zip(layout.children())
  .filter_map(|((child, state), layout)| {
- child.as_widget_mut().overlay(state, layout, renderer)
+ child
+ .as_widget_mut()
+ .overlay(state, layout, renderer, translation)
  })
  .collect::<Vec<_>>();
 

src/native/modal.rs

@@ -10,7 +10,7 @@ use iced_widget::core::{
  mouse::{self, Cursor},
  overlay, renderer,
  widget::{Operation, Tree},
- Clipboard, Element, Event, Layout, Length, Point, Rectangle, Shell, Widget,
+ Clipboard, Element, Event, Layout, Length, Rectangle, Shell, Vector, Widget,
 };
 
 pub use crate::style::modal::StyleSheet;
@@ -232,28 +232,27 @@ where
  state: &'b mut Tree,
  layout: Layout<'_>,
  renderer: &Renderer,
+ translation: Vector,
  ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> {
  if let Some(overlay) = &mut self.overlay {
- let bounds = layout.bounds();
- let position = Point::new(bounds.x, bounds.y);
  overlay.as_widget().diff(&mut state.children[1]);
 
- Some(overlay::Element::new(
- position,
- Box::new(ModalOverlay::new(
- &mut state.children[1],
- overlay,
- self.backdrop.clone(),
- self.esc.clone(),
- self.style.clone(),
- self.horizontal_alignment,
- self.vertical_alignment,
- )),
- ))
+ Some(overlay::Element::new(Box::new(ModalOverlay::new(
+ &mut state.children[1],
+ overlay,
+ self.backdrop.clone(),
+ self.esc.clone(),
+ self.style.clone(),
+ self.horizontal_alignment,
+ self.vertical_alignment,
+ ))))
  } else {
- self.underlay
- .as_widget_mut()
- .overlay(&mut state.children[0], layout, renderer)
+ self.underlay.as_widget_mut().overlay(
+ &mut state.children[0],
+ layout,
+ renderer,
+ translation,
+ )
  }
  }
 

src/native/overlay/color_picker.rs

@@ -118,7 +118,7 @@ where
  /// Turn this [`ColorPickerOverlay`] into an overlay [`Element`](overlay::Element).
  #[must_use]
  pub fn overlay(self) -> overlay::Element<'a, Message, Theme, Renderer> {
- overlay::Element::new(self.position, Box::new(self))
+ overlay::Element::new(Box::new(self))
  }
 
  /// The event handling for the HSV color area.
@@ -552,13 +552,7 @@ where
  Message: 'static + Clone,
  Theme: 'a + StyleSheet + button::StyleSheet + widget::text::StyleSheet,
 {
- fn layout(
- &mut self,
- renderer: &Renderer,
- bounds: Size,
- position: Point,
- _translation: Vector,
- ) -> Node {
+ fn layout(&mut self, renderer: &Renderer, bounds: Size) -> Node {
  let (max_width, max_height) = if bounds.width > bounds.height {
  (600.0, 300.0)
  } else {
@@ -598,10 +592,10 @@ where
  .bounds();
 
  // ----------- Block 1 ----------------------
- let block1_node = block1_layout(self, renderer, block1_bounds, position);
+ let block1_node = block1_layout(self, renderer, block1_bounds, self.position);
 
  // ----------- Block 2 ----------------------
- let block2_node = block2_layout(self, renderer, block2_bounds, position);
+ let block2_node = block2_layout(self, renderer, block2_bounds, self.position);
 
  let (width, height) = if bounds.width > bounds.height {
  (
@@ -618,7 +612,7 @@ where
  let mut node =
  Node::with_children(Size::new(width, height), vec![block1_node, block2_node]);
 
- node.center_and_bounce(position, bounds);
+ node.center_and_bounce(self.position, bounds);
  node
  }
 

src/native/overlay/context_menu.rs

@@ -13,7 +13,7 @@ use iced_widget::core::{
  overlay, renderer, touch,
  widget::tree::Tree,
  window, Border, Clipboard, Color, Element, Event, Layout, Point, Rectangle, Shadow, Shell,
- Size, Vector,
+ Size,
 };
 
 /// The overlay of the [`ContextMenu`](crate::native::ContextMenu).
@@ -28,6 +28,8 @@ pub struct ContextMenuOverlay<
  Renderer: 'a + core::Renderer,
  Theme: StyleSheet,
 {
+ // The position of the element
+ position: Point,
  /// The state of the [`ContextMenuOverlay`].
  tree: &'a mut Tree,
  /// The content of the [`ContextMenuOverlay`].
@@ -46,6 +48,7 @@ where
 {
  /// Creates a new [`ContextMenuOverlay`].
  pub(crate) fn new<C>(
+ position: Point,
  tree: &'a mut Tree,
  content: C,
  style: <Theme as StyleSheet>::Style,
@@ -55,6 +58,7 @@ where
  C: Into<Element<'a, Message, Theme, Renderer>>,
  {
  ContextMenuOverlay {
+ position,
  tree,
  content: content.into(),
  style,
@@ -63,8 +67,8 @@ where
  }
 
  /// Turn this [`ContextMenuOverlay`] into an overlay [`Element`](overlay::Element).
- pub fn overlay(self, position: Point) -> overlay::Element<'a, Message, Theme, Renderer> {
- overlay::Element::new(position, Box::new(self))
+ pub fn overlay(self) -> overlay::Element<'a, Message, Theme, Renderer> {
+ overlay::Element::new(Box::new(self))
  }
 }
 
@@ -75,13 +79,7 @@ where
  Renderer: 'a + core::Renderer,
  Theme: StyleSheet,
 {
- fn layout(
- &mut self,
- renderer: &Renderer,
- bounds: Size,
- position: Point,
- _translation: Vector,
- ) -> Node {
+ fn layout(&mut self, renderer: &Renderer, bounds: Size) -> Node {
  let limits = Limits::new(Size::ZERO, bounds);
  let max_size = limits.max();
 
@@ -91,7 +89,7 @@ where
  .layout(self.tree, renderer, &limits);
 
  // Try to stay inside borders
- let mut position = position;
+ let mut position = self.position;
  if position.x + content.size().width > bounds.width {
  position.x = f32::max(0.0, position.x - content.size().width);
  }