[gtk+] statusicon: Rely on GtkIconHelper for pixbuf resizes
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] statusicon: Rely on GtkIconHelper for pixbuf resizes
- Date: Fri, 13 Jul 2012 14:58:35 +0000 (UTC)
commit 37262f9725511d26c2e177d85c2b0ba3e3f09e77
Author: Carlos Garnacho <carlos lanedo com>
Date: Fri Jul 13 15:57:45 2012 +0200
statusicon: Rely on GtkIconHelper for pixbuf resizes
The same is now achieved by forcing pixbuf rescaling on the icon helper
gtk/gtkstatusicon.c | 30 +++---------------------------
1 files changed, 3 insertions(+), 27 deletions(-)
---
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index 5c8a591..7e53df0 100644
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -836,6 +836,7 @@ gtk_status_icon_init (GtkStatusIcon *status_icon)
status_icon->priv = priv;
priv->icon_helper = _gtk_icon_helper_new ();
+ _gtk_icon_helper_set_force_scale_pixbuf (priv->icon_helper, TRUE);
priv->visible = TRUE;
#ifdef GDK_WINDOWING_X11
@@ -1352,7 +1353,6 @@ gtk_status_icon_update_image (GtkStatusIcon *status_icon)
#endif
GtkStyleContext *context;
GtkWidget *widget;
- GtkImageType storage_type = _gtk_icon_helper_get_storage_type (priv->icon_helper);
GdkPixbuf *pixbuf;
gint round_size;
@@ -1365,32 +1365,8 @@ gtk_status_icon_update_image (GtkStatusIcon *status_icon)
context = gtk_widget_get_style_context (widget);
round_size = round_pixel_size (widget, priv->size);
- if (storage_type == GTK_IMAGE_PIXBUF)
- {
- GdkPixbuf *scaled;
- gint width;
- gint height;
-
- pixbuf = _gtk_icon_helper_ensure_pixbuf (priv->icon_helper, context);
-
- width = gdk_pixbuf_get_width (pixbuf);
- height = gdk_pixbuf_get_height (pixbuf);
-
- if (width > round_size || height > round_size)
- {
- scaled = gdk_pixbuf_scale_simple (pixbuf,
- MIN (round_size, width),
- MIN (round_size, height),
- GDK_INTERP_BILINEAR);
- g_object_unref (pixbuf);
- pixbuf = scaled;
- }
- }
- else
- {
- _gtk_icon_helper_set_pixel_size (priv->icon_helper, round_size);
- pixbuf = _gtk_icon_helper_ensure_pixbuf (priv->icon_helper, context);
- }
+ _gtk_icon_helper_set_pixel_size (priv->icon_helper, round_size);
+ pixbuf = _gtk_icon_helper_ensure_pixbuf (priv->icon_helper, context);
if (pixbuf != NULL)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]