Add move popover positioning options

This commit is contained in:
Jeremy Soller 2024-02-27 10:25:37 -07:00
parent 7abfef4eed
commit b55fad7e33
No known key found for this signature in database
GPG key ID: D02FD439211AF56F

View file

@ -22,11 +22,19 @@ pub fn popover<'a, Message, Renderer>(
Popover::new(content) Popover::new(content)
} }
#[derive(Clone, Copy, Debug, Default)]
pub enum Position {
#[default]
Center,
Bottom,
Point(Point),
}
pub struct Popover<'a, Message, Renderer> { pub struct Popover<'a, Message, Renderer> {
content: Element<'a, Message, crate::Theme, Renderer>, content: Element<'a, Message, crate::Theme, Renderer>,
// XXX Avoid refcell; improve iced overlay API? // XXX Avoid refcell; improve iced overlay API?
popup: Option<RefCell<Element<'a, Message, crate::Theme, Renderer>>>, popup: Option<RefCell<Element<'a, Message, crate::Theme, Renderer>>>,
position: Option<Point>, position: Position,
} }
impl<'a, Message, Renderer> Popover<'a, Message, Renderer> { impl<'a, Message, Renderer> Popover<'a, Message, Renderer> {
@ -34,7 +42,7 @@ impl<'a, Message, Renderer> Popover<'a, Message, Renderer> {
Self { Self {
content: content.into(), content: content.into(),
popup: None, popup: None,
position: None, position: Position::Center,
} }
} }
@ -43,8 +51,8 @@ impl<'a, Message, Renderer> Popover<'a, Message, Renderer> {
self self
} }
pub fn position(mut self, position: Point) -> Self { pub fn position(mut self, position: Position) -> Self {
self.position = Some(position); self.position = position;
self self
} }
@ -167,38 +175,35 @@ where
) -> Option<overlay::Element<'b, Message, crate::Theme, Renderer>> { ) -> Option<overlay::Element<'b, Message, crate::Theme, Renderer>> {
if let Some(popup) = &self.popup { if let Some(popup) = &self.popup {
let bounds = layout.bounds(); let bounds = layout.bounds();
let (position, centered) = match self.position {
Some(relative) => ( // Calculate overlay position from relative position
bounds.position() + Vector::new(relative.x, relative.y), let mut overlay_position = match self.position {
false, Position::Center | Position::Bottom => Point::new(
bounds.x + bounds.width / 2.0,
bounds.y + bounds.height / 2.0,
), ),
None => { Position::Point(relative) => {
// Set position to center bounds.position() + Vector::new(relative.x, relative.y)
(
Point::new(
bounds.x + bounds.width / 2.0,
bounds.y + bounds.height / 2.0,
),
true,
)
} }
}; };
// Round position to prevent rendering issues
overlay_position.x = overlay_position.x.round();
overlay_position.y = overlay_position.y.round();
// XXX needed to use RefCell to get &mut for popup element // XXX needed to use RefCell to get &mut for popup element
Some(overlay::Element::new( Some(overlay::Element::new(
position, overlay_position,
Box::new(Overlay { Box::new(Overlay {
tree: &mut tree.children[1], tree: &mut tree.children[1],
content: popup, content: popup,
centered, position: self.position,
}), }),
)) ))
} else { } else {
self.content.as_widget_mut().overlay( self.content
&mut tree.children[0], .as_widget_mut()
layout, .overlay(&mut tree.children[0], layout, renderer)
renderer
)
} }
} }
} }
@ -217,7 +222,7 @@ where
pub struct Overlay<'a, 'b, Message, Renderer> { pub struct Overlay<'a, 'b, Message, Renderer> {
tree: &'a mut Tree, tree: &'a mut Tree,
content: &'a RefCell<Element<'b, Message, crate::Theme, Renderer>>, content: &'a RefCell<Element<'b, Message, crate::Theme, Renderer>>,
centered: bool, position: Position,
} }
impl<'a, 'b, Message, Renderer> overlay::Overlay<Message, crate::Theme, Renderer> impl<'a, 'b, Message, Renderer> overlay::Overlay<Message, crate::Theme, Renderer>
@ -238,20 +243,33 @@ where
.borrow() .borrow()
.as_widget() .as_widget()
.layout(self.tree, renderer, &limits); .layout(self.tree, renderer, &limits);
if self.centered { match self.position {
// Position is set to the center bottom of the lower widget Position::Center => {
let width = node.size().width; // Position is set to the center of the widget
let height = node.size().height; let width = node.size().width;
position.x = (position.x - width / 2.0).clamp(0.0, bounds.width - width); let height = node.size().height;
position.y = (position.y - height / 2.0).clamp(0.0, bounds.height - height); position.x = (position.x - width / 2.0).clamp(0.0, bounds.width - width);
} else { position.y = (position.y - height / 2.0).clamp(0.0, bounds.height - height);
// Position is using context menu logic }
let size = node.size(); Position::Bottom => {
position.x = position.x.clamp(0.0, bounds.width - size.width); // Position is set to the center bottom of the widget
if position.y + size.height > bounds.height { let width = node.size().width;
position.y = (position.y - size.height).clamp(0.0, bounds.height - size.height); position.x = (position.x - width / 2.0).clamp(0.0, bounds.width - width);
}
Position::Point(_) => {
// Position is using context menu logic
let size = node.size();
position.x = position.x.clamp(0.0, bounds.width - size.width);
if position.y + size.height > bounds.height {
position.y = (position.y - size.height).clamp(0.0, bounds.height - size.height);
}
} }
} }
// Round position to prevent rendering issues
position.x = position.x.round();
position.y = position.y.round();
node.move_to(position) node.move_to(position)
} }