revert: "fix(popover): match popup styling to designs"
Some application popovers required the previous behavior
This reverts commit 882481e518.
This commit is contained in:
parent
866da0f94b
commit
e13ab24151
1 changed files with 6 additions and 17 deletions
|
|
@ -14,20 +14,18 @@ use iced_core::{
|
||||||
Clipboard, Element, Layout, Length, Point, Rectangle, Shell, Size, Vector, Widget,
|
Clipboard, Element, Layout, Length, Point, Rectangle, Shell, Size, Vector, Widget,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
pub use iced_widget::container::{Catalog, Style};
|
||||||
|
|
||||||
pub fn popover<'a, Message, Renderer>(
|
pub fn popover<'a, Message, Renderer>(
|
||||||
content: impl Into<Element<'a, Message, crate::Theme, 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)
|
Popover::new(content)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, Default)]
|
#[derive(Clone, Copy, Debug, Default)]
|
||||||
pub enum Position {
|
pub enum Position {
|
||||||
Center,
|
|
||||||
#[default]
|
#[default]
|
||||||
|
Center,
|
||||||
Bottom,
|
Bottom,
|
||||||
Point(Point),
|
Point(Point),
|
||||||
}
|
}
|
||||||
|
|
@ -42,11 +40,7 @@ pub struct Popover<'a, Message, Renderer> {
|
||||||
on_close: Option<Message>,
|
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 {
|
pub fn new(content: impl Into<Element<'a, Message, crate::Theme, Renderer>>) -> Self {
|
||||||
Self {
|
Self {
|
||||||
content: content.into(),
|
content: content.into(),
|
||||||
|
|
@ -73,12 +67,7 @@ where
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
pub fn popup(mut self, popup: impl Into<Element<'a, Message, crate::Theme, Renderer>>) -> Self {
|
pub fn popup(mut self, popup: impl Into<Element<'a, Message, crate::Theme, Renderer>>) -> Self {
|
||||||
self.popup = Some(
|
self.popup = Some(popup.into());
|
||||||
iced_widget::container(popup)
|
|
||||||
.padding(crate::theme::spacing().space_xxs)
|
|
||||||
.class(crate::style::Container::Dropdown)
|
|
||||||
.into(),
|
|
||||||
);
|
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue