Skip to content

SourceList: don't subclass sealed Gtk.CellRendererPixbuf #1088

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
ryonakano merged 3 commits into from
Aug 11, 2026
Merged

SourceList: don't subclass sealed Gtk.CellRendererPixbuf #1088

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08527ef
SourceList: don't subclass sealed Gtk.CellRendererPixbuf
danirabbit Aug 11, 2026
768d238
Update SourceList.vala
danirabbit Aug 11, 2026
1dfd374
Merge branch 'master' into danirabbit/sourcelist-sealedrendererpixbug
ryonakano Aug 11, 2026
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
32 changes: 5 additions & 27 deletions src/SourceList/SourceList.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,30 +952,6 @@ public class Mail.SourceList : Gtk.Bin {
}
}

/**
* Class responsible for rendering Item.icon and Item.activatable. It also
* notifies about clicks through the activated() signal.
*/
private class CellRendererIcon : Gtk.CellRendererPixbuf {
public signal void activated (string path);

construct {
mode = Gtk.CellRendererMode.ACTIVATABLE;
}

public override bool activate (
Gdk.Event event,
Gtk.Widget widget,
string path,
Gdk.Rectangle background_area,
Gdk.Rectangle cell_area,
Gtk.CellRendererState flags
) {
activated (path);
return true;
}
}

/**
* A cell renderer that only adds space.
*/
Expand Down Expand Up @@ -1052,7 +1028,7 @@ public class Mail.SourceList : Gtk.Bin {
private Gtk.CellRendererText text_cell;
private Gtk.EventControllerKey key_controller;
private Gtk.GestureMultiPress button_controller;
private CellRendererIcon icon_cell;
private Gtk.CellRendererPixbuf icon_cell;
private CellRendererBadge badge_cell;
private CellRendererExpander primary_expander_cell;
private CellRendererExpander secondary_expander_cell;
Expand Down Expand Up @@ -1096,7 +1072,9 @@ public class Mail.SourceList : Gtk.Bin {
text_cell.editing_started.connect (on_editing_started);
text_cell.editing_canceled.connect (on_editing_canceled);

icon_cell = new CellRendererIcon ();
icon_cell = new Gtk.CellRendererPixbuf () {
mode = ACTIVATABLE
};

// First expander. Used for normal expandable items
primary_expander_cell = new CellRendererExpander () {
Expand Down Expand Up @@ -1731,7 +1709,7 @@ public class Mail.SourceList : Gtk.Bin {
Gtk.CellRenderer renderer,
Gtk.TreeModel model, Gtk.TreeIter iter
) {
var icon_renderer = renderer as CellRendererIcon;
var icon_renderer = renderer as Gtk.CellRendererPixbuf;
assert (icon_renderer != null);

bool visible = false;
Expand Down