Don't use custom PopoverContainer in status area applet

This type seems unnecessary now that
https://docs.gtk.org/gtk4/method.MenuButton.set_child.html exists. And
in any case, isn't needed here.

applets/cosmic-applet-status-area/src/main.rs

@@ -2,7 +2,6 @@ use gtk4::{glib, prelude::*};
 
 mod dbus_service;
 mod deref_cell;
-mod popover_container;
 mod status_area;
 mod status_menu;
 mod status_notifier_watcher;

applets/cosmic-applet-status-area/src/popover_container.rs

@@ -1,89 +0,0 @@
-use cascade::cascade;
-use gtk4::{glib, prelude::*, subclass::prelude::*};
-
-use crate::deref_cell::DerefCell;
-
-/// Unlike gtk4's `MenuButton`, this supports a custom child.
-#[derive(Default)]
-pub struct PopoverContainerInner {
-    child: DerefCell<gtk4::Widget>,
-    popover: DerefCell<gtk4::Popover>,
-}
-
-#[glib::object_subclass]
-impl ObjectSubclass for PopoverContainerInner {
-    const NAME: &'static str = "S76PopoverContainer";
-    type ParentType = gtk4::Widget;
-    type Type = PopoverContainer;
-}
-
-impl ObjectImpl for PopoverContainerInner {
-    fn constructed(&self, obj: &PopoverContainer) {
-        let popover = cascade! {
-            gtk4::Popover::new();
-            ..set_parent(obj);
-        };
-
-        self.popover.set(popover);
-    }
-
-    fn dispose(&self, _obj: &PopoverContainer) {
-        self.child.unparent();
-        self.popover.unparent();
-    }
-}
-
-impl WidgetImpl for PopoverContainerInner {
-    fn measure(
-        &self,
-        _obj: &PopoverContainer,
-        orientation: gtk4::Orientation,
-        for_size: i32,
-    ) -> (i32, i32, i32, i32) {
-        self.child.measure(orientation, for_size)
-    }
-
-    fn size_allocate(&self, _obj: &PopoverContainer, width: i32, height: i32, baseline: i32) {
-        self.child
-            .size_allocate(&gtk4::Allocation::new(0, 0, width, height), baseline);
-        self.popover.present();
-    }
-
-    fn focus(&self, _obj: &PopoverContainer, direction: gtk4::DirectionType) -> bool {
-        if self.popover.is_visible() {
-            self.popover.child_focus(direction)
-        } else {
-            self.child.child_focus(direction)
-        }
-    }
-}
-
-glib::wrapper! {
-    pub struct PopoverContainer(ObjectSubclass<PopoverContainerInner>)
-        @extends gtk4::Widget;
-}
-
-impl PopoverContainer {
-    pub fn new<T: IsA<gtk4::Widget>>(child: &T) -> Self {
-        let obj = glib::Object::new::<Self>(&[]).unwrap();
-        child.set_parent(&obj);
-        obj.inner().child.set(child.clone().upcast());
-        obj
-    }
-
-    fn inner(&self) -> &PopoverContainerInner {
-        PopoverContainerInner::from_instance(self)
-    }
-
-    pub fn popover(&self) -> &gtk4::Popover {
-        &self.inner().popover
-    }
-
-    pub fn popup(&self) {
-        self.popover().popup();
-    }
-
-    pub fn popdown(&self) {
-        self.popover().popdown();
-    }
-}

applets/cosmic-applet-status-area/src/status_menu.rs

@@ -11,7 +11,6 @@ use zbus::dbus_proxy;
 use zvariant::OwnedValue;
 
 use crate::deref_cell::DerefCell;
-use crate::popover_container::PopoverContainer;
 
 struct Menu {
     box_: gtk4::Box,
@@ -20,8 +19,7 @@ struct Menu {
 
 #[derive(Default)]
 pub struct StatusMenuInner {
-    button: DerefCell<gtk4::ToggleButton>,
+    menu_button: DerefCell<gtk4::MenuButton>,
-    popover_container: DerefCell<PopoverContainer>,
     vbox: DerefCell<gtk4::Box>,
     item: DerefCell<StatusNotifierItemProxy<'static>>,
     dbus_menu: DerefCell<DBusMenuProxy<'static>>,
@@ -45,25 +43,24 @@ impl ObjectImpl for StatusMenuInner {
             gtk4::Box::new(gtk4::Orientation::Vertical, 0);
         };
 
-        let button = cascade! {
+        let popover = cascade! {
-            gtk4::ToggleButton::new();
+            gtk4::Popover::new();
+            ..set_child(Some(&vbox));
+        };
+
+        let menu_button = cascade! {
+            gtk4::MenuButton::new();
             ..set_has_frame(false);
-        };
-
-        let popover_container = cascade! {
-            PopoverContainer::new(&button);
             ..set_parent(obj);
-            ..popover().set_child(Some(&vbox));
+            ..set_popover(Some(&popover));
-            ..popover().bind_property("visible", &button, "active").flags(glib::BindingFlags::BIDIRECTIONAL).build();
         };
 
-        self.button.set(button);
+        self.menu_button.set(menu_button);
-        self.popover_container.set(popover_container);
         self.vbox.set(vbox);
     }
 
     fn dispose(&self, _obj: &StatusMenu) {
-        self.button.unparent();
+        self.menu_button.unparent();
     }
 }
 
@@ -90,7 +87,7 @@ impl StatusMenu {
             .await?;
         let obj = glib::Object::new::<Self>(&[]).unwrap();
         let icon_name = item.icon_name().await?;
-        obj.inner().button.set_icon_name(&icon_name);
+        obj.inner().menu_button.set_icon_name(&icon_name);
 
         let menu = item.menu().await?;
         let menu = DBusMenuProxy::builder(&connection)
@@ -205,7 +202,7 @@ impl StatusMenu {
                     ..connect_clicked(clone!(@weak self as self_ => move |_| {
                             // XXX data, timestamp
                             if close_on_click {
-                                self_.inner().popover_container.popdown();
+                                self_.inner().menu_button.popdown();
                             }
                             glib::MainContext::default().spawn_local(clone!(@strong self_ => async move {
                                 let _ = self_.inner().dbus_menu.event(id, "clicked", &0.into(), 0).await;