Merge lp:~jassmith/window-picker-applet/active-icon into lp:window-picker-applet

[Jason Smith]

[Jason Smith (jassmith)]

Beautify the active window indicator on window-picker-applet. Somewhat inspired from Docky.
Image: http://dl.getdropbox.com/u/269345/wpa_active_window.png

[lp:~jassmith/window-picker-applet/active-icon]

93. By Jason Smith <jason@t500> on 2009-08-27

task-list.c : remove spacing from list. task-items now have their own internal buffer

94. By Jason Smith <jason@t500> on 2009-08-27

task-item.c : Soften edges

[Neil J. Patel (njpatel)]

I like it...looks nice with Dust. Approve.

review: Approve

=== modified file 'src/task-item.c'
--- src/task-item.c	2009-08-25 19:11:59 +0000
+++ src/task-item.c	2009-08-27 05:29:40 +0000
@@ -219,24 +219,12 @@
   gint width = gdk_pixbuf_get_width (pbuf);
   gint height = gdk_pixbuf_get_height (pbuf);
 
-  if (width > size || height > size)
+  if (MAX (width, height) != size)
   {
-    gdouble scale;
-    if (width > size)
-    {
-      scale = (gdouble) size / (gdouble) width;
-      width = size;
-      height = (int) (height * scale);
-    }
-    if (height > size)
-    {
-      scale = (gdouble) size / (gdouble) height;
-      height = size;
-      width = (int) (width * scale);
-    }
+    gdouble scale = (gdouble) size / (gdouble) MAX (width, height);
   
     GdkPixbuf *tmp = pbuf;
-    pbuf = gdk_pixbuf_scale_simple (tmp, width, height, GDK_INTERP_HYPER);
+    pbuf = gdk_pixbuf_scale_simple (tmp, (gint) (width * scale), (gint) (height * scale), GDK_INTERP_HYPER);
     
     g_object_unref (tmp);
   }
@@ -259,7 +247,7 @@
   item = TASK_ITEM (widget);
   priv = item->priv;
   
-  g_return_val_if_fail (WNCK_IS_WINDOW (item->priv->window), FALSE);
+  g_return_val_if_fail (WNCK_IS_WINDOW (priv->window), FALSE);
   
   area = priv->area;
   cr = gdk_cairo_create (event->window);
@@ -267,14 +255,27 @@
   GdkPixbuf *pbuf = priv->pixbuf;
   
   gint size = MIN (area.height, area.width);
+  gboolean active = wnck_window_is_active (priv->window);
   
-  if (GDK_IS_PIXBUF (pbuf) && (gdk_pixbuf_get_width (pbuf) > size ||
-                               gdk_pixbuf_get_height (pbuf) > size))
+  if (GDK_IS_PIXBUF (pbuf) && 
+      gdk_pixbuf_get_width (pbuf) != size &&
+      gdk_pixbuf_get_height (pbuf) != size)
   {
   	g_object_unref (pbuf);
   	pbuf = NULL;
   }
   
+  if (active)
+  {
+    cairo_rectangle (cr, area.x + .5, area.y - 4, area.width - 1, area.height + 8);
+    cairo_set_source_rgba (cr, .8, .8, .8, .2);
+    cairo_fill_preserve (cr);
+    
+    cairo_set_line_width (cr, 1);
+    cairo_set_source_rgba (cr, 1, 1, 1, .5);
+    cairo_stroke (cr);
+  }
+  
   if (!pbuf)
   {
     pbuf = task_item_sized_pixbuf_for_window (item, priv->window, size);
@@ -287,7 +288,7 @@
   
   g_object_unref (pbuf);
   
-  if (!priv->mouse_over && wnck_window_or_transient_needs_attention (priv->window))
+  if (!priv->mouse_over && wnck_window_or_transient_needs_attention (priv->window)) /* urgent */
   {
     GTimeVal current_time;
     g_get_current_time (&current_time);
@@ -298,13 +299,13 @@
     gdouble alpha = .75 + (cos (ms / 500) / 4);
     cairo_paint_with_alpha (cr, alpha);
   }
-  else if (priv->mouse_over || wnck_window_is_active (priv->window))
+  else if (priv->mouse_over || active) /* focused */
   {
     cairo_paint (cr);
   }
-  else
+  else /* not focused */
   {
-    cairo_paint_with_alpha (cr, .6);
+    cairo_paint_with_alpha (cr, .65);
   }
   
   cairo_destroy (cr);
@@ -319,8 +320,8 @@
 {
   TaskItemPrivate *priv;
   
-  if (allocation->width != allocation->height)
-    gtk_widget_set_size_request (widget, allocation->height, -1);
+  if (allocation->width != allocation->height + 6)
+    gtk_widget_set_size_request (widget, allocation->height + 6, -1);
 
   g_return_if_fail (TASK_IS_ITEM (item));