From ddf9fb3f49d9185c738949cdead64ed681748d47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Wed, 23 Jul 2025 15:49:13 -0700 Subject: [PATCH] SourceRow: always show buttons --- src/Widgets/SourceRow.vala | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/src/Widgets/SourceRow.vala b/src/Widgets/SourceRow.vala index 8721c39af..7d7aedc7e 100644 --- a/src/Widgets/SourceRow.vala +++ b/src/Widgets/SourceRow.vala @@ -17,9 +17,7 @@ public class Calendar.SourceRow : Gtk.ListBoxRow { private Gtk.Box info_box; private Gtk.Button delete_button; - private Gtk.Revealer delete_revealer; private Gtk.Button edit_button; - private Gtk.Revealer edit_revealer; private Gtk.Label calendar_name_label; private Gtk.Label message_label; @@ -62,30 +60,15 @@ public class Calendar.SourceRow : Gtk.ListBoxRow { style_calendar_color (cal.dup_color ()); delete_button = new Gtk.Button.from_icon_name ("edit-delete-symbolic", MENU) { - relief = NONE, sensitive = source.removable, tooltip_text = source.removable ? _("Remove") : _("Not Removable") }; - delete_button.get_style_context ().add_class (Gtk.STYLE_CLASS_DESTRUCTIVE_ACTION); - - delete_revealer = new Gtk.Revealer () { - child = delete_button, - reveal_child = false, - transition_type = CROSSFADE - }; edit_button = new Gtk.Button.from_icon_name ("edit-symbolic", MENU) { - relief = NONE, sensitive = source.writable, tooltip_text = source.writable ? _("Edit…"): _("Not Editable") }; - edit_revealer = new Gtk.Revealer () { - child = edit_button, - reveal_child = false, - transition_type = CROSSFADE - }; - var calendar_box = new Gtk.Box (HORIZONTAL, 6) { margin_top = 3, margin_end = 12, @@ -94,8 +77,8 @@ public class Calendar.SourceRow : Gtk.ListBoxRow { }; calendar_box.add (visible_checkbutton); calendar_box.add (calendar_name_label); - calendar_box.add (delete_revealer); - calendar_box.add (edit_revealer); + calendar_box.add (delete_button); + calendar_box.add (edit_button); var calendar_event_box = new Gtk.EventBox (); calendar_event_box.add (calendar_box); @@ -142,23 +125,6 @@ public class Calendar.SourceRow : Gtk.ListBoxRow { stack.visible_child = calendar_event_box; }); - calendar_event_box.add_events (Gdk.EventMask.ENTER_NOTIFY_MASK | Gdk.EventMask.LEAVE_NOTIFY_MASK); - calendar_event_box.enter_notify_event.connect ((event) => { - delete_revealer.set_reveal_child (true); - edit_revealer.set_reveal_child (true); - return false; - }); - - calendar_event_box.leave_notify_event.connect ((event) => { - if (event.detail == Gdk.NotifyType.INFERIOR) { - return false; - } - - delete_revealer.set_reveal_child (false); - edit_revealer.set_reveal_child (false); - return false; - }); - source.changed.connect (source_has_changed); }