Merge lp:~jassmith/window-picker-applet/desat into lp:window-picker-applet

[Jason Smith]

[Jason Smith (jassmith)]

Desaturates non-active task-items to create a more obvious active task. Desaturation is currently 100% however can be backed down to make effect less severe.

[lp:~jassmith/window-picker-applet/desat]

95. By Jason Smith <jason@t500> on 2009-09-01

src/task-item.c : Saturate urgent items also

[Mirco Müller (macslow)]

> Desaturates non-active task-items to create a more obvious active task.
> Desaturation is currently 100% however can be backed down to make effect less
> severe.

Before using desat after gdk_pixbuf_new() you should check that it's not NULL and handle this possible error-case. Apart from that the patch looks good.

review: Needs Fixing

[Jason Smith (jassmith)]

> > Desaturates non-active task-items to create a more obvious active task.
> > Desaturation is currently 100% however can be backed down to make effect
> less
> > severe.
>
> Before using desat after gdk_pixbuf_new() you should check that it's not NULL
> and handle this possible error-case. Apart from that the patch looks good.

Done

[lp:~jassmith/window-picker-applet/desat]

96. By Jason Smith <jason@t500> on 2009-09-01

Handle out of memory error condition

[Mirco Müller (macslow)]

> > > Desaturates non-active task-items to create a more obvious active task.
> > > Desaturation is currently 100% however can be backed down to make effect
> > less
> > > severe.
> >
> > Before using desat after gdk_pixbuf_new() you should check that it's not
> NULL
> > and handle this possible error-case. Apart from that the patch looks good.
>
> Done

Good.

review: Approve

[Jason Smith (jassmith)]

I am going to wait for Neil to give a thumbs up here also.

[Neil J. Patel (njpatel)]

Looks good. Approved.

review: Approve

=== modified file 'src/task-item.c'
--- src/task-item.c	2009-09-01 08:05:33 +0000
+++ src/task-item.c	2009-09-01 09:27:32 +0000
@@ -240,6 +240,8 @@
   TaskItem *item;
   GdkRectangle area;
   TaskItemPrivate *priv;
+  GdkPixbuf *desat;
+  GdkPixbuf *pbuf;
   
   g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (TASK_IS_ITEM (widget), FALSE);
@@ -253,7 +255,8 @@
   area = priv->area;
   cr = gdk_cairo_create (event->window);
   
-  GdkPixbuf *pbuf = priv->pixbuf;
+  pbuf = priv->pixbuf;
+  desat = NULL;
   
   gint size = MIN (area.height, area.width);
   gboolean active = wnck_window_is_active (priv->window);
@@ -282,11 +285,30 @@
     pbuf = task_item_sized_pixbuf_for_window (item, priv->window, size);
   }
   
-  gdk_cairo_set_source_pixbuf (cr, 
-                               pbuf, 
-                               (area.x + (area.width - gdk_pixbuf_get_width (pbuf)) / 2), 
-                               (area.y + (area.height - gdk_pixbuf_get_height (pbuf)) / 2));
-  
+  if (active || priv->mouse_over)
+  {
+    gdk_cairo_set_source_pixbuf (cr, 
+                                 pbuf, 
+                                 (area.x + (area.width - gdk_pixbuf_get_width (pbuf)) / 2), 
+                                 (area.y + (area.height - gdk_pixbuf_get_height (pbuf)) / 2));
+  }
+  else
+  {
+    desat = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+                            TRUE,
+                            gdk_pixbuf_get_bits_per_sample (pbuf),
+                            gdk_pixbuf_get_width (pbuf),
+                            gdk_pixbuf_get_height (pbuf));
+    
+    gdk_pixbuf_saturate_and_pixelate (pbuf,
+                                      desat,
+                                      0,
+                                      FALSE);
+    gdk_cairo_set_source_pixbuf (cr, 
+                                 desat, 
+                                 (area.x + (area.width - gdk_pixbuf_get_width (desat)) / 2), 
+                                 (area.y + (area.height - gdk_pixbuf_get_height (desat)) / 2));
+  }
   if (!priv->mouse_over && wnck_window_or_transient_needs_attention (priv->window)) /* urgent */
   {
     GTimeVal current_time;
@@ -307,6 +329,9 @@
     cairo_paint_with_alpha (cr, .65);
   }
   
+  if (GDK_IS_PIXBUF (desat))
+    g_object_unref (desat);
+ 
   cairo_destroy (cr);
   
   return FALSE;