PanelLabel: GTK4 prep

Author: leolost2605

src/Indicator.vala

@@ -52,28 +52,6 @@ public class DateTime.Indicator : Wingpanel.Indicator {
             panel_label = new Widgets.PanelLabel () {
                 tooltip_markup = Granite.TOOLTIP_SECONDARY_TEXT_MARKUP.printf (_("Middle-click to open Calendar"))
             };
-
-            panel_label.button_press_event.connect ((e) => {
-                if (e.button == Gdk.BUTTON_MIDDLE) {
-                    var command = "io.elementary.calendar --show-day %s".printf (new GLib.DateTime.now_local ().format ("%F"));
-                    try {
-                        var appinfo = AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE);
-                        appinfo.launch_uris (null, null);
-                    } catch (GLib.Error e) {
-                        var dialog = new Granite.MessageDialog.with_image_from_icon_name (
-                            _("Unable To Launch Calendar"),
-                            _("The program \"io.elementary.calendar\" may not be installed"),
-                            "dialog-error"
-                        );
-                        dialog.show_error_details (e.message);
-                        dialog.run ();
-                        dialog.destroy ();
-                    }
-                    return Gdk.EVENT_STOP;
-                }
-
-                return Gdk.EVENT_PROPAGATE;
-            });
         }
 
         return panel_label;

src/Widgets/PanelLabel.vala

@@ -26,6 +26,8 @@ public class DateTime.Widgets.PanelLabel : Gtk.Box {
     public bool clock_show_seconds { get; set; }
     public bool clock_show_weekday { get; set; }
 
+    private Gtk.GestureMultiPress gesture_click;
+
     construct {
         date_label = new Gtk.Label (null) {
             margin_end = 12
@@ -57,6 +59,11 @@ public class DateTime.Widgets.PanelLabel : Gtk.Box {
         time_manager = Services.TimeManager.get_default ();
         time_manager.minute_changed.connect (update_labels);
         time_manager.notify["is-12h"].connect (update_labels);
+
+        gesture_click = new Gtk.GestureMultiPress (this) {
+            button = Gdk.BUTTON_MIDDLE
+        };
+        gesture_click.pressed.connect (on_pressed);
     }
 
     private void update_labels () {
@@ -72,4 +79,20 @@ public class DateTime.Widgets.PanelLabel : Gtk.Box {
         string time_format = Granite.DateTime.get_default_time_format (time_manager.is_12h, clock_show_seconds);
         time_label.label = GLib.Markup.printf_escaped ("<span font_features='tnum'>%s</span>", time_manager.format (time_format));
     }
+
+    private void on_pressed () {
+        var command = "io.elementary.calendar --show-day %s".printf (new GLib.DateTime.now_local ().format ("%F"));
+        try {
+            var appinfo = AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE);
+            appinfo.launch_uris (null, null);
+        } catch (GLib.Error e) {
+            var dialog = new Granite.MessageDialog.with_image_from_icon_name (
+                _("Unable To Launch Calendar"),
+                _("The program \"io.elementary.calendar\" may not be installed"),
+                "dialog-error"
+            );
+            dialog.show_error_details (e.message);
+            dialog.present ();
+        }
+    }
 }