Use custom PopoverContainer instead of gtk4::MenuButton

src/main.rs

@@ -4,6 +4,7 @@ mod deref_cell;
 mod mpris;
 mod mpris_player;
 mod notifications;
+mod popover_container;
 mod status_area;
 mod status_menu;
 mod status_notifier_watcher;

src/popover_container.rs

@@ -0,0 +1,96 @@
+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 {
+                x: 0,
+                y: 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();
+    }
+}

src/status_menu.rs

@@ -9,6 +9,7 @@ use gtk4::{
 use std::{borrow::Cow, cell::RefCell, collections::HashMap, fmt, io};
 
 use crate::deref_cell::DerefCell;
+use crate::popover_container::PopoverContainer;
 
 struct Menu {
     box_: gtk4::Box,
@@ -17,7 +18,8 @@ struct Menu {
 
 #[derive(Default)]
 pub struct StatusMenuInner {
-    menu_button: DerefCell<gtk4::MenuButton>,
+    button: DerefCell<gtk4::ToggleButton>,
+    popover_container: DerefCell<PopoverContainer>,
     vbox: DerefCell<gtk4::Box>,
     item: DerefCell<StatusNotifierItem>,
     dbus_menu: DerefCell<DBusMenu>,
@@ -41,22 +43,25 @@ impl ObjectImpl for StatusMenuInner {
             gtk4::Box::new(gtk4::Orientation::Vertical, 0);
         };
 
-        let menu_button = cascade! {
-            gtk4::MenuButton::new();
-            ..set_parent(obj);
+        let button = cascade! {
+            gtk4::ToggleButton::new();
             ..set_has_frame(false);
-            ..set_popover(Some(&cascade! {
-                gtk4::Popover::new();
-                ..set_child(Some(&vbox));
-            }));
         };
 
-        self.menu_button.set(menu_button);
+        let popover_container = cascade! {
+            PopoverContainer::new(&button);
+            ..set_parent(obj);
+            ..popover().set_child(Some(&vbox));
+            ..popover().bind_property("visible", &button, "active").flags(glib::BindingFlags::BIDIRECTIONAL).build();
+        };
+
+        self.button.set(button);
+        self.popover_container.set(popover_container);
         self.vbox.set(vbox);
     }
 
     fn dispose(&self, _obj: &StatusMenu) {
-        self.menu_button.unparent();
+        self.button.unparent();
     }
 }
 
@@ -72,7 +77,7 @@ impl StatusMenu {
         let item = StatusNotifierItem::new(name).await?;
         let obj = glib::Object::new::<Self>(&[]).unwrap();
         if let Some(icon_name) = item.icon_name().as_deref() {
-            obj.inner().menu_button.set_icon_name(&icon_name);
+            obj.inner().button.set_icon_name(&icon_name);
         }
 
         let menu = item.menu().unwrap(); // XXX unwrap?
@@ -175,7 +180,7 @@ impl StatusMenu {
                     ..connect_clicked(clone!(@weak self as self_ => move |_| {
                             // XXX data, timestamp
                             if close_on_click {
-                                self_.inner().menu_button.popdown();
+                                self_.inner().popover_container.popdown();
                             }
                             self_.inner().dbus_menu.event(id, "clicked", &0.to_variant(), 0);
                     }));

src/time_button.rs

@@ -7,11 +7,12 @@ use gtk4::{
 
 use crate::deref_cell::DerefCell;
 use crate::mpris::MprisControls;
+use crate::popover_container::PopoverContainer;
 
 #[derive(Default)]
 pub struct TimeButtonInner {
     calendar: DerefCell<gtk4::Calendar>,
-    menu_button: DerefCell<gtk4::MenuButton>,
+    button: DerefCell<gtk4::ToggleButton>,
 }
 
 #[glib::object_subclass]
@@ -31,25 +32,25 @@ impl ObjectImpl for TimeButtonInner {
             gtk4::Calendar::new();
         };
 
-        let menu_button = cascade! {
-            gtk4::MenuButton::new();
-            ..set_parent(obj);
+        let button = cascade! {
+            gtk4::ToggleButton::new();
             ..set_has_frame(false);
-            ..set_direction(gtk4::ArrowType::None);
-            ..style_context().remove_class("toggle");
-            ..set_popover(Some(&cascade! {
-                gtk4::Popover::new();
-                ..set_child(Some(&cascade! {
-                    gtk4::Box::new(gtk4::Orientation::Horizontal, 0);
-                    ..append(&MprisControls::new());
-                    ..append(&calendar);
-                }));
-                ..connect_show(clone!(@strong obj => move |_| obj.opening()));
+        };
+
+        cascade! {
+            PopoverContainer::new(&button);
+            ..set_parent(obj);
+            ..popover().set_child(Some(&cascade! {
+                gtk4::Box::new(gtk4::Orientation::Horizontal, 0);
+                ..append(&MprisControls::new());
+                ..append(&calendar);
             }));
+            ..popover().connect_show(clone!(@strong obj => move |_| obj.opening()));
+            ..popover().bind_property("visible", &button, "active").flags(glib::BindingFlags::BIDIRECTIONAL).build();
         };
 
         self.calendar.set(calendar);
-        self.menu_button.set(menu_button);
+        self.button.set(button);
 
         // TODO: better way to do this?
         glib::timeout_add_seconds_local(
@@ -63,7 +64,7 @@ impl ObjectImpl for TimeButtonInner {
     }
 
     fn dispose(&self, _obj: &TimeButton) {
-        self.menu_button.unparent();
+        self.button.unparent();
     }
 }
 
@@ -93,7 +94,7 @@ impl TimeButton {
         // TODO: Locale-based formatting?
         let time = chrono::Local::now();
         self.inner()
-            .menu_button
+            .button
             .set_label(&time.format("%b %-d %-I:%M %p").to_string());
         // time.format("%B %-d %Y")
     }