Skip to content

[Popover] Match popup styling to designs #1053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Popover] Match popup styling to designs #1053

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions src/widget/popover.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,20 @@ use iced_core::{
Clipboard, Element, Layout, Length, Point, Rectangle, Shell, Size, Vector, Widget,
};

pub use iced_widget::container::{Catalog, Style};

pub fn popover<'a, Message, Renderer>(
content: impl Into<Element<'a, Message, crate::Theme, Renderer>>,
) -> Popover<'a, Message, Renderer> {
) -> Popover<'a, Message, Renderer>
where
Renderer: iced_core::Renderer + 'a,
Message: 'a,
{
Popover::new(content)
}

#[derive(Clone, Copy, Debug, Default)]
pub enum Position {
#[default]
Center,
#[default]
Bottom,
Point(Point),
}
Expand All @@ -40,7 +42,11 @@ pub struct Popover<'a, Message, Renderer> {
on_close: Option<Message>,
}

impl<'a, Message, Renderer> Popover<'a, Message, Renderer> {
impl<'a, Message, Renderer> Popover<'a, Message, Renderer>
where
Renderer: iced_core::Renderer + 'a,
Message: 'a,
{
pub fn new(content: impl Into<Element<'a, Message, crate::Theme, Renderer>>) -> Self {
Self {
content: content.into(),
Expand All @@ -67,7 +73,12 @@ impl<'a, Message, Renderer> Popover<'a, Message, Renderer> {

#[inline]
pub fn popup(mut self, popup: impl Into<Element<'a, Message, crate::Theme, Renderer>>) -> Self {
self.popup = Some(popup.into());
self.popup = Some(
iced_widget::container(popup)
.padding(crate::theme::spacing().space_xxs)
.class(crate::style::Container::Dropdown)
.into(),
);
self
}

Expand Down
Loading