Skip to content

SourceList: remove unused ActivatableIcon #1056

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
jeremypw merged 4 commits into from
Jul 23, 2026
Merged

SourceList: remove unused ActivatableIcon #1056

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ff0d17
SourceList: remove unused ActivatableIcon
danirabbit Jul 22, 2026
e6ddd3b
Merge branch 'master' into danirabbit/sourcelist-rmactivatable
jeremypw Jul 22, 2026
6217b71
Merge branch 'master' into danirabbit/sourcelist-rmactivatable
danirabbit Jul 22, 2026
fcb9bf5
Merge branch 'master' into danirabbit/sourcelist-rmactivatable
jeremypw Jul 23, 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
52 changes: 1 addition & 51 deletions src/SourceList/SourceList.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ public class Mail.SourceList : Gtk.ScrolledWindow {
* - editable | DataModel::on_item_prop_changed | Queried when needed (See Tree::start_editing_item)
* - visible | DataModel::on_item_prop_changed | DataModel::filter_visible_func
* - icon | DataModel::on_item_prop_changed | Tree::icon_cell_data_func
* - activatable | Same as @icon | Same as @icon
* + ExpandableItem | |
* - collapsible | DataModel::on_item_prop_changed | Tree::update_expansion
* | | Tree::expander_cell_data_func
Expand Down Expand Up @@ -162,14 +161,6 @@ public class Mail.SourceList : Gtk.ScrolledWindow {
this.name = new_name;
}

/**
* The {@link Granite.Widgets.SourceList.Item.activatable} icon was activated.
*
* @see Granite.Widgets.SourceList.Item.activatable
* @since 0.2
*/
public virtual signal void action_activated () { }

/**
* Emitted when the item is double-clicked or when it is selected and one of the keys:
* Space, Shift+Space, Return or Enter is pressed. This signal is //also// for
Expand Down Expand Up @@ -269,23 +260,6 @@ public class Mail.SourceList : Gtk.ScrolledWindow {
*/
public Icon icon { get; set; }

/**
* An activatable icon that works like a button.
*
* It can be used for e.g. showing an //"eject"// icon on a device's item.
*
* @see Granite.Widgets.SourceList.Item.action_activated
* @since 0.2
*/
public Icon activatable { get; set; }

/**
* The tooltip for the activatable icon.
*
* @since 5.0
*/
public string activatable_tooltip { get; set; default = ""; }

/**
* Creates a new {@link Granite.Widgets.SourceList.Item}.
*
Expand Down Expand Up @@ -324,7 +298,6 @@ public class Mail.SourceList : Gtk.ScrolledWindow {
* * {@link Granite.Widgets.SourceList.Item.selectable}
* * {@link Granite.Widgets.SourceList.Item.editable}
* * {@link Granite.Widgets.SourceList.Item.icon}
* * {@link Granite.Widgets.SourceList.Item.activatable}
* * {@link Granite.Widgets.SourceList.Item.badge}
*
* Root-level expandable items (i.e. Main Categories) are ''not'' displayed when they contain
Expand Down Expand Up @@ -1342,7 +1315,6 @@ public class Mail.SourceList : Gtk.ScrolledWindow {
private Gtk.Entry? editable_entry;
private Gtk.CellRendererText text_cell;
private CellRendererIcon icon_cell;
private CellRendererIcon activatable_cell;
private CellRendererBadge badge_cell;
private CellRendererExpander primary_expander_cell;
private CellRendererExpander secondary_expander_cell;
Expand Down Expand Up @@ -1441,12 +1413,6 @@ public class Mail.SourceList : Gtk.ScrolledWindow {
item_column.pack_end (secondary_expander_cell, false);
item_column.set_cell_data_func (secondary_expander_cell, expander_cell_data_func);

activatable_cell = new CellRendererIcon ();
activatable_cell.xpad = 6;
activatable_cell.activated.connect (on_activatable_activated);
item_column.pack_end (activatable_cell, false);
item_column.set_cell_data_func (activatable_cell, icon_cell_data_func);

badge_cell = new CellRendererBadge ();
badge_cell.xpad = 1;
badge_cell.xalign = 1;
Expand Down Expand Up @@ -1676,13 +1642,6 @@ public class Mail.SourceList : Gtk.ScrolledWindow {
over_cell (column, path, icon_cell, x - start_cell_area.x)) {

return should_show;
} else if (over_cell (column, path, activatable_cell, x - start_cell_area.x)) {
if (item.activatable_tooltip == "") {
return false;
} else {
tooltip.set_markup (item.activatable_tooltip);
return true;
}
}
}

Expand Down Expand Up @@ -1923,12 +1882,6 @@ public class Mail.SourceList : Gtk.ScrolledWindow {
on_editing_canceled ();
}

private void on_activatable_activated (string item_path_str) {
var item = get_item_from_path_string (item_path_str);
if (item != null)
item.action_activated ();
}

private Item? get_item_from_path_string (string item_path_str) {
var item_path = new Gtk.TreePath.from_string (item_path_str);
return data_model.get_item_from_path (item_path);
Expand Down Expand Up @@ -2077,8 +2030,7 @@ public class Mail.SourceList : Gtk.ScrolledWindow {
// normal expandable item that is not selectable (special care is taken to
// not break the activatable/action icons for such cases).
// The expander only works like a visual indicator for these items.
unselectable_item_clicked = is_category
|| (!item.selectable && !over_cell (column, path, activatable_cell, cell_x));
unselectable_item_clicked = is_category || (!item.selectable);

if (!unselectable_item_clicked
&& over_primary_expander (column, path, cell_x)
Expand Down Expand Up @@ -2292,8 +2244,6 @@ public class Mail.SourceList : Gtk.ScrolledWindow {
if (visible) {
if (icon_renderer == icon_cell)
icon = item.icon;
else if (icon_renderer == activatable_cell)
icon = item.activatable;
else
assert_not_reached ();
}
Expand Down
Loading