Merge branch 'master' into jeremypw/deprec-timezone

meson.build

@@ -72,6 +72,7 @@ executable(
     'src/Widgets/EntryPopover/DateTime.vala',
     'src/Widgets/EntryPopover/Generic.vala',
     'src/Widgets/EntryPopover/Location.vala',
+    'src/Widgets/PopoverMenuitem.vala',
     'src/Widgets/ScheduledRow.vala',
     'src/Widgets/SourceRow.vala',
     'src/Widgets/ScheduledTaskListBox.vala',

src/MainWindow.vala

@@ -80,7 +80,7 @@ public class Tasks.MainWindow : Hdy.ApplicationWindow {
 
         add_tasklist_buttonbox = new Gtk.Box (VERTICAL, 3);
 
-        var online_accounts_button = new Gtk.ModelButton () {
+        var online_accounts_button = new PopoverMenuitem () {
             text = _("Online Accounts Settings…")
         };
 
@@ -389,7 +389,7 @@ public class Tasks.MainWindow : Hdy.ApplicationWindow {
         }
         collection_sources.add (collection_source);
 
-        var source_button = new Gtk.ModelButton () {
+        var source_button = new PopoverMenuitem () {
             text = Util.get_esource_collection_display_name (collection_source),
             sensitive = Application.model.is_add_task_list_supported (collection_source)
         };

src/Widgets/EntryPopover/DateTime.vala

@@ -42,7 +42,7 @@ public class Tasks.Widgets.EntryPopover.DateTime : Generic<GLib.DateTime?> {
             margin_top = 3
         };
 
-        var today_button = new Gtk.ModelButton () {
+        var today_button = new PopoverMenuitem () {
             text = _("Today")
         };
 

src/Widgets/ListSettingsPopover.vala

@@ -82,15 +82,10 @@ public class Tasks.Widgets.ListSettingsPopover : Gtk.Popover {
             margin_top = 3
         };
 
-        var delete_list_accel_label = new Granite.AccelLabel.from_action_name (
-            _("Delete List…"),
-            MainWindow.ACTION_PREFIX + MainWindow.ACTION_DELETE_SELECTED_LIST
-        );
-
-        var delete_list_menuitem = new Gtk.ModelButton ();
-        delete_list_menuitem.action_name = delete_list_accel_label.action_name;
-        delete_list_menuitem.get_child ().destroy ();
-        delete_list_menuitem.add (delete_list_accel_label);
+        var delete_list_menuitem = new PopoverMenuitem () {
+            action_name = MainWindow.ACTION_PREFIX + MainWindow.ACTION_DELETE_SELECTED_LIST,
+            text = _("Delete List…")
+        };
         delete_list_menuitem.get_style_context ().add_class (Gtk.STYLE_CLASS_DESTRUCTIVE_ACTION);
 
         var box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0) {

src/Widgets/PopoverMenuitem.vala

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 elementary, Inc. (https://elementary.io)
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+class Tasks.PopoverMenuitem : Gtk.Button {
+    public string text {
+        set {
+            child = new Granite.AccelLabel (value) {
+                action_name = this.action_name
+            };
+
+            get_accessible ().accessible_name = value;
+        }
+    }
+
+    class construct {
+        set_css_name ("modelbutton");
+    }
+
+    construct {
+        set_accessible_role (Atk.Role.MENU_ITEM);
+
+        clicked.connect (() => {
+            var popover = (Gtk.Popover) get_ancestor (typeof (Gtk.Popover));
+            if (popover != null) {
+                popover.popdown ();
+            }
+        });
+    }
+}