From e13ab241510ddc2e9ddfc112786426328b3124de Mon Sep 17 00:00:00 2001 From: Michael Aaron Murphy Date: Fri, 5 Dec 2025 16:46:00 +0100 Subject: [PATCH] revert: "fix(popover): match popup styling to designs" Some application popovers required the previous behavior This reverts commit 882481e518f786a92a77cd24e7f8669e63441108. --- src/widget/popover.rs | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/src/widget/popover.rs b/src/widget/popover.rs index 26120b7..ddc3145 100644 --- a/src/widget/popover.rs +++ b/src/widget/popover.rs @@ -14,20 +14,18 @@ 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>, -) -> Popover<'a, Message, Renderer> -where - Renderer: iced_core::Renderer + 'a, - Message: 'a, -{ +) -> Popover<'a, Message, Renderer> { Popover::new(content) } #[derive(Clone, Copy, Debug, Default)] pub enum Position { - Center, #[default] + Center, Bottom, Point(Point), } @@ -42,11 +40,7 @@ pub struct Popover<'a, Message, Renderer> { on_close: Option, } -impl<'a, Message, Renderer> Popover<'a, Message, Renderer> -where - Renderer: iced_core::Renderer + 'a, - Message: 'a, -{ +impl<'a, Message, Renderer> Popover<'a, Message, Renderer> { pub fn new(content: impl Into>) -> Self { Self { content: content.into(), @@ -73,12 +67,7 @@ where #[inline] pub fn popup(mut self, popup: impl Into>) -> Self { - self.popup = Some( - iced_widget::container(popup) - .padding(crate::theme::spacing().space_xxs) - .class(crate::style::Container::Dropdown) - .into(), - ); + self.popup = Some(popup.into()); self }