Skip to content

SourceRow: always show buttons #857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danirabbit merged 2 commits into from
Aug 16, 2025
Merged

SourceRow: always show buttons #857

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddf9fb3
SourceRow: always show buttons
danirabbit Jul 23, 2025
4b8f0ae
Merge branch 'master' into danirabbit/sourcerow-alwaysbuttons
danirabbit Aug 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 2 additions & 36 deletions src/Widgets/SourceRow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand All @@ -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);
Expand Down Expand Up @@ -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);
}

Expand Down