From 636b9f97d012198242832a74ac70a471098a66c8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 10 Mar 2010 11:45:53 -0600 Subject: Adding in an image helper library. --- libindicator/indicator-image-helper.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 libindicator/indicator-image-helper.c (limited to 'libindicator/indicator-image-helper.c') diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c new file mode 100644 index 0000000..9d487fd --- /dev/null +++ b/libindicator/indicator-image-helper.c @@ -0,0 +1,12 @@ + +#include "indicator-image-helper.h" + +GtkImage * +indicator_image_helper (const gchar * name) +{ + g_return_val_if_fail(name != NULL, NULL); + g_return_val_if_fail(name[0] != '\0', NULL); + + + return NULL; +} -- cgit v1.2.3 From 48e8a34c8d54500bfa7b303d36d9cca9c8348ccf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 10 Mar 2010 12:29:30 -0600 Subject: Fleshing out the image loading function. --- libindicator/indicator-image-helper.c | 51 ++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) (limited to 'libindicator/indicator-image-helper.c') diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c index 9d487fd..3bc25a2 100644 --- a/libindicator/indicator-image-helper.c +++ b/libindicator/indicator-image-helper.c @@ -1,12 +1,61 @@ #include "indicator-image-helper.h" +const gchar * INDICATOR_NAMES_DATA = "indicator-names-data"; + GtkImage * indicator_image_helper (const gchar * name) { g_return_val_if_fail(name != NULL, NULL); g_return_val_if_fail(name[0] != '\0', NULL); + /* Get the default theme */ + GtkIconTheme * default_theme = gtk_icon_theme_get_default(); + g_return_val_if_fail(default_theme != NULL, NULL); + + /* Build us a GIcon */ + GIcon * icon_names = g_themed_icon_new_with_default_fallbacks(name); + g_return_val_if_fail(icon_names != NULL, NULL); + + /* Look through the themes for that icon */ + GtkIconInfo * icon_info = gtk_icon_theme_lookup_by_gicon(default_theme, icon_names, 22, 0); + if (icon_info == NULL) { + g_warning("Unable to find icon '%s' in theme.", name); + g_object_unref(icon_names); + return NULL; + } + + /* Grab the filename */ + const gchar * icon_filename = gtk_icon_info_get_filename(icon_info); + g_return_val_if_fail(icon_filename != NULL, NULL); /* An error because we shouldn't get info without a filename */ + + /* Build a pixbuf */ + GError * error = NULL; + GdkPixbuf * pixbuf = gdk_pixbuf_new_from_file(icon_filename, &error); + gtk_icon_info_free(icon_info); + + if (pixbuf == NULL) { + g_error("Unable to load icon from name '%s' file '%s' because: %s", name, icon_filename, error == NULL ? "I don't know" : error->message); + g_object_unref(icon_names); + return NULL; + } + + /* Build us an image */ + GtkImage * image = GTK_IMAGE(gtk_image_new_from_pixbuf(pixbuf)); + g_object_unref(pixbuf); + + if (image == NULL) { + g_error("Unable to create image from pixbuf on icon name '%s'", name); + g_object_unref(icon_names); + return NULL; + } + + /* Attach our names to the image */ + g_object_set_data_full(G_OBJECT(image), INDICATOR_NAMES_DATA, icon_names, g_object_unref); + + /* Connect to all changes */ + /* TODO */ - return NULL; + /* Return our built image */ + return image; } -- cgit v1.2.3 From 805edb88641378614175ad9f4f205bbdc1d707a1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 10 Mar 2010 13:10:36 -0600 Subject: Pulled out a bunch of the code into a refresh function for signals. --- libindicator/indicator-image-helper.c | 51 ++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 18 deletions(-) (limited to 'libindicator/indicator-image-helper.c') diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c index 3bc25a2..5897711 100644 --- a/libindicator/indicator-image-helper.c +++ b/libindicator/indicator-image-helper.c @@ -3,31 +3,28 @@ const gchar * INDICATOR_NAMES_DATA = "indicator-names-data"; -GtkImage * -indicator_image_helper (const gchar * name) +void +refresh_image (GtkImage * image) { - g_return_val_if_fail(name != NULL, NULL); - g_return_val_if_fail(name[0] != '\0', NULL); + g_return_if_fail(GTK_IS_IMAGE(image)); + + GIcon * icon_names = (GIcon *)g_object_get_data(G_OBJECT(image), INDICATOR_NAMES_DATA); + g_return_if_fail(icon_names != NULL); /* Get the default theme */ GtkIconTheme * default_theme = gtk_icon_theme_get_default(); - g_return_val_if_fail(default_theme != NULL, NULL); - - /* Build us a GIcon */ - GIcon * icon_names = g_themed_icon_new_with_default_fallbacks(name); - g_return_val_if_fail(icon_names != NULL, NULL); + g_return_if_fail(default_theme != NULL); /* Look through the themes for that icon */ GtkIconInfo * icon_info = gtk_icon_theme_lookup_by_gicon(default_theme, icon_names, 22, 0); if (icon_info == NULL) { - g_warning("Unable to find icon '%s' in theme.", name); - g_object_unref(icon_names); - return NULL; + g_warning("Unable to find icon in theme."); + return; } /* Grab the filename */ const gchar * icon_filename = gtk_icon_info_get_filename(icon_info); - g_return_val_if_fail(icon_filename != NULL, NULL); /* An error because we shouldn't get info without a filename */ + g_return_if_fail(icon_filename != NULL); /* An error because we shouldn't get info without a filename */ /* Build a pixbuf */ GError * error = NULL; @@ -35,14 +32,29 @@ indicator_image_helper (const gchar * name) gtk_icon_info_free(icon_info); if (pixbuf == NULL) { - g_error("Unable to load icon from name '%s' file '%s' because: %s", name, icon_filename, error == NULL ? "I don't know" : error->message); - g_object_unref(icon_names); - return NULL; + g_error("Unable to load icon from file '%s' because: %s", icon_filename, error == NULL ? "I don't know" : error->message); + return; } + /* Put the pixbuf on the image */ + gtk_image_set_from_pixbuf(image, pixbuf); + g_object_unref(G_OBJECT(pixbuf)); + + return; +} + +GtkImage * +indicator_image_helper (const gchar * name) +{ + g_return_val_if_fail(name != NULL, NULL); + g_return_val_if_fail(name[0] != '\0', NULL); + + /* Build us a GIcon */ + GIcon * icon_names = g_themed_icon_new_with_default_fallbacks(name); + g_return_val_if_fail(icon_names != NULL, NULL); + /* Build us an image */ - GtkImage * image = GTK_IMAGE(gtk_image_new_from_pixbuf(pixbuf)); - g_object_unref(pixbuf); + GtkImage * image = GTK_IMAGE(gtk_image_new()); if (image == NULL) { g_error("Unable to create image from pixbuf on icon name '%s'", name); @@ -53,6 +65,9 @@ indicator_image_helper (const gchar * name) /* Attach our names to the image */ g_object_set_data_full(G_OBJECT(image), INDICATOR_NAMES_DATA, icon_names, g_object_unref); + /* Put the pixbuf in */ + refresh_image(image); + /* Connect to all changes */ /* TODO */ -- cgit v1.2.3 From 64df2c666c7411b43f82ae299fca86c48719354a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 10 Mar 2010 13:25:26 -0600 Subject: Setting up the callback for themes changing. --- libindicator/indicator-image-helper.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'libindicator/indicator-image-helper.c') diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c index 5897711..08a4875 100644 --- a/libindicator/indicator-image-helper.c +++ b/libindicator/indicator-image-helper.c @@ -3,7 +3,7 @@ const gchar * INDICATOR_NAMES_DATA = "indicator-names-data"; -void +static void refresh_image (GtkImage * image) { g_return_if_fail(GTK_IS_IMAGE(image)); @@ -43,6 +43,16 @@ refresh_image (GtkImage * image) return; } +/* Handles the theme changed signal to refresh the icon to make + sure that it changes appropriately */ +static void +theme_changed_cb (GtkIconTheme * theme, gpointer user_data) +{ + GtkImage * image = GTK_IMAGE(user_data); + refresh_image(image); + return; +} + GtkImage * indicator_image_helper (const gchar * name) { @@ -69,7 +79,7 @@ indicator_image_helper (const gchar * name) refresh_image(image); /* Connect to all changes */ - /* TODO */ + g_signal_connect(G_OBJECT(gtk_icon_theme_get_default()), "changed", G_CALLBACK(theme_changed_cb), image); /* Return our built image */ return image; -- cgit v1.2.3 From ba4a73a9ea33a1996ff7965dd7996b54901b385a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 10 Mar 2010 14:26:20 -0600 Subject: Disconnect from theme update when the image goes away. --- libindicator/indicator-image-helper.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'libindicator/indicator-image-helper.c') diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c index 08a4875..3e8c627 100644 --- a/libindicator/indicator-image-helper.c +++ b/libindicator/indicator-image-helper.c @@ -53,6 +53,15 @@ theme_changed_cb (GtkIconTheme * theme, gpointer user_data) return; } +/* Removes the signal on the theme that was calling update on this + image. */ +static void +image_destroyed_cb (GtkImage * image, gpointer user_data) +{ + g_signal_handlers_disconnect_by_func(gtk_icon_theme_get_default(), theme_changed_cb, image); + return; +} + GtkImage * indicator_image_helper (const gchar * name) { @@ -80,6 +89,7 @@ indicator_image_helper (const gchar * name) /* Connect to all changes */ g_signal_connect(G_OBJECT(gtk_icon_theme_get_default()), "changed", G_CALLBACK(theme_changed_cb), image); + g_signal_connect(G_OBJECT(image), "destroy", G_CALLBACK(image_destroyed_cb), NULL); /* Return our built image */ return image; -- cgit v1.2.3 From 37f0f3400bce36b98e89595bdbb694bec7139ee2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 10 Mar 2010 15:30:37 -0600 Subject: Doing dynamic size calculation based on the font if we have a prop set telling us to do so. --- libindicator/indicator-image-helper.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'libindicator/indicator-image-helper.c') diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c index 3e8c627..76ac3c2 100644 --- a/libindicator/indicator-image-helper.c +++ b/libindicator/indicator-image-helper.c @@ -15,8 +15,22 @@ refresh_image (GtkImage * image) GtkIconTheme * default_theme = gtk_icon_theme_get_default(); g_return_if_fail(default_theme != NULL); + gint icon_size = 22; + + GtkStyle * style = gtk_widget_get_style(GTK_WIDGET(image)); + GValue styleprop = {0}; + gtk_style_get_style_property(style, GTK_TYPE_IMAGE, "x-ayatana-indicator-dynamic", &styleprop); + + if (G_VALUE_HOLDS_BOOLEAN(&styleprop) && g_value_get_boolean(&styleprop)) { + PangoContext * context = gtk_widget_get_pango_context(GTK_WIDGET(image)); + PangoFontMetrics * metrics = pango_context_get_metrics(context, style->font_desc, pango_context_get_language(context)); + icon_size = PANGO_PIXELS(pango_font_metrics_get_ascent(metrics)) + PANGO_PIXELS(pango_font_metrics_get_descent(metrics)); + g_debug("Looking for icon size %d", icon_size); + pango_font_metrics_unref(metrics); + } + /* Look through the themes for that icon */ - GtkIconInfo * icon_info = gtk_icon_theme_lookup_by_gicon(default_theme, icon_names, 22, 0); + GtkIconInfo * icon_info = gtk_icon_theme_lookup_by_gicon(default_theme, icon_names, icon_size, 0); if (icon_info == NULL) { g_warning("Unable to find icon in theme."); return; -- cgit v1.2.3 From 12ab8f4476b500c21747514cfbec272d0cbd5ada Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 10 Mar 2010 16:14:46 -0600 Subject: If we get an icon that is too big, we have to scale it. --- libindicator/indicator-image-helper.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'libindicator/indicator-image-helper.c') diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c index 76ac3c2..53776c4 100644 --- a/libindicator/indicator-image-helper.c +++ b/libindicator/indicator-image-helper.c @@ -1,4 +1,5 @@ +#include #include "indicator-image-helper.h" const gchar * INDICATOR_NAMES_DATA = "indicator-names-data"; @@ -50,6 +51,16 @@ refresh_image (GtkImage * image) return; } + /* Scale icon if all we get is something too big. */ + if (gdk_pixbuf_get_height(pixbuf) > icon_size) { + gfloat scale = (gfloat)icon_size / (gfloat)gdk_pixbuf_get_height(pixbuf); + gint width = round(gdk_pixbuf_get_width(pixbuf) * scale); + + GdkPixbuf * scaled = gdk_pixbuf_scale_simple(pixbuf, width, icon_size, GDK_INTERP_BILINEAR); + g_object_unref(G_OBJECT(pixbuf)); + pixbuf = scaled; + } + /* Put the pixbuf on the image */ gtk_image_set_from_pixbuf(image, pixbuf); g_object_unref(G_OBJECT(pixbuf)); -- cgit v1.2.3 From 5867fa760a390d48f30e8794f6292601c61cefad Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 10 Mar 2010 16:40:19 -0600 Subject: Adding in a copyright header. --- libindicator/indicator-image-helper.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'libindicator/indicator-image-helper.c') diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c index 53776c4..cbbad3d 100644 --- a/libindicator/indicator-image-helper.c +++ b/libindicator/indicator-image-helper.c @@ -1,3 +1,25 @@ +/* +A little helper to make a themed image with fallbacks that +is only constrained in the vertical dimention. + +Copyright 2010 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ #include #include "indicator-image-helper.h" -- cgit v1.2.3 From b4ca4f6ff3d2176b42cad8ec5e5970452d83edb9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Mar 2010 10:22:17 -0600 Subject: Splitting things out into an update function and a buid function. --- libindicator/indicator-image-helper.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'libindicator/indicator-image-helper.c') diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c index cbbad3d..2703208 100644 --- a/libindicator/indicator-image-helper.c +++ b/libindicator/indicator-image-helper.c @@ -112,21 +112,24 @@ image_destroyed_cb (GtkImage * image, gpointer user_data) GtkImage * indicator_image_helper (const gchar * name) { - g_return_val_if_fail(name != NULL, NULL); - g_return_val_if_fail(name[0] != '\0', NULL); - - /* Build us a GIcon */ - GIcon * icon_names = g_themed_icon_new_with_default_fallbacks(name); - g_return_val_if_fail(icon_names != NULL, NULL); - /* Build us an image */ GtkImage * image = GTK_IMAGE(gtk_image_new()); - if (image == NULL) { - g_error("Unable to create image from pixbuf on icon name '%s'", name); - g_object_unref(icon_names); - return NULL; - } + indicator_image_helper_update(image, name); + + return image; +} + +void +indicator_image_helper_update (GtkImage * image, const gchar * name) +{ + g_return_if_fail(name != NULL); + g_return_if_fail(name[0] != '\0'); + g_return_if_fail(image != NULL); + + /* Build us a GIcon */ + GIcon * icon_names = g_themed_icon_new_with_default_fallbacks(name); + g_return_if_fail(icon_names != NULL); /* Attach our names to the image */ g_object_set_data_full(G_OBJECT(image), INDICATOR_NAMES_DATA, icon_names, g_object_unref); @@ -138,6 +141,5 @@ indicator_image_helper (const gchar * name) g_signal_connect(G_OBJECT(gtk_icon_theme_get_default()), "changed", G_CALLBACK(theme_changed_cb), image); g_signal_connect(G_OBJECT(image), "destroy", G_CALLBACK(image_destroyed_cb), NULL); - /* Return our built image */ - return image; + return; } -- cgit v1.2.3 From e31a7de28b3a030186e49a4b0d88730604196539 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Mar 2010 10:35:14 -0600 Subject: Check to see if we've seen the image previously before adding signals in. --- libindicator/indicator-image-helper.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'libindicator/indicator-image-helper.c') diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c index 2703208..ae417c7 100644 --- a/libindicator/indicator-image-helper.c +++ b/libindicator/indicator-image-helper.c @@ -109,6 +109,8 @@ image_destroyed_cb (GtkImage * image, gpointer user_data) return; } +/* Builds an image with the name and fallbacks and all kinds of fun + stuff . */ GtkImage * indicator_image_helper (const gchar * name) { @@ -120,6 +122,7 @@ indicator_image_helper (const gchar * name) return image; } +/* Updates and image with all the fun stuff */ void indicator_image_helper_update (GtkImage * image, const gchar * name) { @@ -131,6 +134,8 @@ indicator_image_helper_update (GtkImage * image, const gchar * name) GIcon * icon_names = g_themed_icon_new_with_default_fallbacks(name); g_return_if_fail(icon_names != NULL); + gboolean seen_previously = (g_object_get_data(G_OBJECT(image), INDICATOR_NAMES_DATA) != NULL); + /* Attach our names to the image */ g_object_set_data_full(G_OBJECT(image), INDICATOR_NAMES_DATA, icon_names, g_object_unref); @@ -138,8 +143,10 @@ indicator_image_helper_update (GtkImage * image, const gchar * name) refresh_image(image); /* Connect to all changes */ - g_signal_connect(G_OBJECT(gtk_icon_theme_get_default()), "changed", G_CALLBACK(theme_changed_cb), image); - g_signal_connect(G_OBJECT(image), "destroy", G_CALLBACK(image_destroyed_cb), NULL); + if (!seen_previously) { + g_signal_connect(G_OBJECT(gtk_icon_theme_get_default()), "changed", G_CALLBACK(theme_changed_cb), image); + g_signal_connect(G_OBJECT(image), "destroy", G_CALLBACK(image_destroyed_cb), NULL); + } return; } -- cgit v1.2.3 From a6ecf4a5b44ae4179d17d1f78da80ced04209b32 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Mar 2010 10:51:17 -0600 Subject: Watching for style changes on the image. --- libindicator/indicator-image-helper.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'libindicator/indicator-image-helper.c') diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c index ae417c7..86d6c25 100644 --- a/libindicator/indicator-image-helper.c +++ b/libindicator/indicator-image-helper.c @@ -109,6 +109,15 @@ image_destroyed_cb (GtkImage * image, gpointer user_data) return; } +/* Catch the style changing on the image to make sure + we've got the latest. */ +static void +image_style_change_cb (GtkImage * image, GtkStyle * previous_style, gpointer user_data) +{ + refresh_image(image); + return; +} + /* Builds an image with the name and fallbacks and all kinds of fun stuff . */ GtkImage * @@ -146,6 +155,7 @@ indicator_image_helper_update (GtkImage * image, const gchar * name) if (!seen_previously) { g_signal_connect(G_OBJECT(gtk_icon_theme_get_default()), "changed", G_CALLBACK(theme_changed_cb), image); g_signal_connect(G_OBJECT(image), "destroy", G_CALLBACK(image_destroyed_cb), NULL); + g_signal_connect(G_OBJECT(image), "style-set", G_CALLBACK(image_style_change_cb), NULL); } return; -- cgit v1.2.3