Skip to content

Simplify icon handling in CPUProcessTreeView by removing regex check for icon paths #469

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 3 commits into from
Oct 2, 2025
Merged

Simplify icon handling in CPUProcessTreeView by removing regex check for icon paths #469

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b210dd
Simplify icon handling in CPUProcessTreeView by removing regex check …
stsdc Oct 1, 2025
5aa3dec
Merge branch 'main' into stsdc/simplify-icon-setting
stsdc Oct 1, 2025
ad06292
Remove regex from CPUProcessTreeView
stsdc Oct 1, 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
15 changes: 1 addition & 14 deletions src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,11 @@ public class Monitor.CPUProcessTreeView : Gtk.TreeView {
private Gtk.TreeViewColumn pid_column;
private Gtk.TreeViewColumn cpu_column;
private Gtk.TreeViewColumn memory_column;
private Regex ? regex;

public signal void process_selected (Process process);

public CPUProcessTreeView (TreeViewModel model) {
this.model = model;
/* *INDENT-OFF* */
regex = /(?i:^.*\.(xpm|png)$)/; // vala-lint=space-before-paren,
/* *INDENT-ON* */

// setup name column
name_column = new Gtk.TreeViewColumn ();
Expand Down Expand Up @@ -112,16 +108,7 @@ public class Monitor.CPUProcessTreeView : Gtk.TreeView {
model.get_value (iter, Column.ICON, out icon_name);
string path = ((string) icon_name);

if (regex.match (path)) {
try {
Gdk.Pixbuf icon = new Gdk.Pixbuf.from_file_at_size (path, 16, -1);
((Gtk.CellRendererPixbuf)icon_cell).pixbuf = icon;
} catch (Error e) {
warning (e.message);
}
} else {
((Gtk.CellRendererPixbuf)icon_cell).icon_name = path;
}
((Gtk.CellRendererPixbuf)icon_cell).icon_name = path;
}

public void cpu_usage_cell_layout (Gtk.CellLayout cell_layout, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter) {
Expand Down
Loading