Skip to content

Commit aa96c9f

Browse files
committed
fix(popover): match popup styling to designs
1 parent 8528477 commit aa96c9f

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

src/widget/popover.rs

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,20 @@ use iced_core::{
1414
Clipboard, Element, Layout, Length, Point, Rectangle, Shell, Size, Vector, Widget,
1515
};
1616

17-
pub use iced_widget::container::{Catalog, Style};
18-
1917
pub fn popover<'a, Message, Renderer>(
2018
content: impl Into<Element<'a, Message, crate::Theme, Renderer>>,
21-
) -> Popover<'a, Message, Renderer> {
19+
) -> Popover<'a, Message, Renderer>
20+
where
21+
Renderer: iced_core::Renderer + 'a,
22+
Message: 'a,
23+
{
2224
Popover::new(content)
2325
}
2426

2527
#[derive(Clone, Copy, Debug, Default)]
2628
pub enum Position {
27-
#[default]
2829
Center,
30+
#[default]
2931
Bottom,
3032
Point(Point),
3133
}
@@ -40,7 +42,11 @@ pub struct Popover<'a, Message, Renderer> {
4042
on_close: Option<Message>,
4143
}
4244

43-
impl<'a, Message, Renderer> Popover<'a, Message, Renderer> {
45+
impl<'a, Message, Renderer> Popover<'a, Message, Renderer>
46+
where
47+
Renderer: iced_core::Renderer + 'a,
48+
Message: 'a,
49+
{
4450
pub fn new(content: impl Into<Element<'a, Message, crate::Theme, Renderer>>) -> Self {
4551
Self {
4652
content: content.into(),
@@ -67,7 +73,12 @@ impl<'a, Message, Renderer> Popover<'a, Message, Renderer> {
6773

6874
#[inline]
6975
pub fn popup(mut self, popup: impl Into<Element<'a, Message, crate::Theme, Renderer>>) -> Self {
70-
self.popup = Some(popup.into());
76+
self.popup = Some(
77+
iced_widget::container(popup)
78+
.padding(crate::theme::spacing().space_xxs)
79+
.class(crate::style::Container::Dropdown)
80+
.into(),
81+
);
7182
self
7283
}
7384

0 commit comments

Comments
 (0)