Skip to content

indicator: Don't render if not full allocation given #82

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

Open
Psykar wants to merge 2 commits into
base: master
Choose a base branch
from
Open

indicator: Don't render if not full allocation given #82

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5284412
indicator: Don't render if not full allocation given
Psykar Dec 13, 2023
bbe2fe3
Debounce the icon updates a little.
Psykar Dec 13, 2023
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
24 changes: 20 additions & 4 deletions indicator/plugin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ static int icon_current_index=0;
static gboolean indicator_connected;
static GtkWidget *graphs_menu_items[GRAPH_MAX];

static int lasttick;

static void
indicator_cleanup(int sig)
{
Expand Down Expand Up @@ -153,9 +155,9 @@ indicator_update_pixbuf(MultiloadPlugin *ma)
if (error != NULL) {
g_error("Cannot save Multiload-ng window to temporary buffer: %s\n", error->message);
g_clear_error(&error);
} else
} else {
app_indicator_set_icon(indicator, icon_filename[icon_current_index]);

}
icon_current_index = 1-icon_current_index;
cairo_surface_destroy (surface);
cairo_destroy (cr);
Expand All @@ -166,6 +168,13 @@ indicator_graph_update_cb(LoadGraph *g, gpointer user_data)
{
GtkAllocation allocation;

// Don't tick too often!
int now = time(NULL);
if (now - lasttick < 1) {
return;
}
lasttick = now;

indicator_update_menu(g->multiload);

if (!g->config->visible)
Expand All @@ -179,11 +188,18 @@ indicator_graph_update_cb(LoadGraph *g, gpointer user_data)
}

// resize widget and offscreen window to fit into panel
int icon_height = indicator_get_icon_height();
if (multiload_get_orientation(g->multiload) == GTK_ORIENTATION_HORIZONTAL)
gtk_widget_set_size_request(GTK_WIDGET(g->multiload->container), multiload_calculate_size_request(g->multiload), indicator_get_icon_height());
gtk_widget_set_size_request(GTK_WIDGET(g->multiload->container), multiload_calculate_size_request(g->multiload), icon_height);
else
gtk_widget_set_size_request(GTK_WIDGET(g->multiload->container), 120, indicator_get_icon_height()); //TODO 120 should not be hardcoded
gtk_widget_set_size_request(GTK_WIDGET(g->multiload->container), 120, icon_height); //TODO 120 should not be hardcoded

gtk_widget_get_allocation (GTK_WIDGET(g->multiload->container), &allocation);
if (allocation.height != icon_height) {
// If we render now then we don't recover, so skip it
return;
}

gtk_window_resize(GTK_WINDOW(offscr), allocation.width, allocation.height);

indicator_update_pixbuf(g->multiload);
Expand Down