From 124254a41b45b790866c8df8d116a7bbef47ca50 Mon Sep 17 00:00:00 2001 From: Ikey Doherty Date: Wed, 16 Nov 2016 17:43:24 +0000 Subject: themes: Add functionality to test for presence of action-icons Each of the themes will have to detect the 'action-icons' hint passed to them in 'set_notification_hints' to make a determination on whether or not to use image based buttons, instead of textual buttons, in their actions boxes. This factory behaviour simply extends the existing checks for urgency-hint, as well as unifying the code style between the various in-tree theme implementations. Signed-off-by: Ikey Doherty --- src/themes/standard/theme.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'src/themes/standard/theme.c') diff --git a/src/themes/standard/theme.c b/src/themes/standard/theme.c index 59e07c2..2200e77 100644 --- a/src/themes/standard/theme.c +++ b/src/themes/standard/theme.c @@ -45,6 +45,7 @@ typedef struct { gboolean has_arrow; gboolean composited; + gboolean action_icons; int point_x; int point_y; @@ -796,27 +797,32 @@ GtkWindow* create_notification(UrlClickedCb url_clicked) return GTK_WINDOW(win); } -void set_notification_hints(GtkWindow* nw, GHashTable* hints) +void set_notification_hints(GtkWindow *nw, GHashTable *hints) { - WindowData* windata = g_object_get_data(G_OBJECT(nw), "windata"); + WindowData *windata = g_object_get_data(G_OBJECT(nw), "windata"); + GValue *value = NULL, *icon_value = NULL; g_assert(windata != NULL); - GValue* value = (GValue*) g_hash_table_lookup(hints, "urgency"); + value = (GValue *)g_hash_table_lookup(hints, "urgency"); + icon_value = (GValue *)g_hash_table_lookup(hints, "action-icons"); if (value != NULL && G_VALUE_HOLDS_UCHAR(value)) { windata->urgency = g_value_get_uchar(value); - if (windata->urgency == URGENCY_CRITICAL) - { + if (windata->urgency == URGENCY_CRITICAL) { gtk_window_set_title(GTK_WINDOW(nw), "Critical Notification"); - } - else - { + } else { gtk_window_set_title(GTK_WINDOW(nw), "Notification"); } } + + /* Determine if action-icons have been requested */ + if (icon_value != NULL && G_VALUE_HOLDS_BOOLEAN(icon_value)) + { + windata->action_icons = g_value_get_boolean(icon_value); + } } void set_notification_timeout(GtkWindow* nw, glong timeout) -- cgit v1.2.1