gdm r6119 - in trunk: . gui/simple-greeter

[halfline svn gnome org]

Author: halfline
Date: Mon Apr  7 05:10:11 2008
New Revision: 6119
URL: http://svn.gnome.org/viewvc/gdm?rev=6119&view=rev

Log:
2008-04-07 Ray Strode <rstrode redhat com>

	* gui/simple-greeter/gdm-cell-renderer-timer.c
	(get_opacity_for_value), (draw_timer):
	Fade the timer renderer in at 5% so it isn't always
	coming up and disappearing when the user is interacting
	with the greeter and automatic login is going


Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-cell-renderer-timer.c

Modified: trunk/gui/simple-greeter/gdm-cell-renderer-timer.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-cell-renderer-timer.c	(original)
+++ trunk/gui/simple-greeter/gdm-cell-renderer-timer.c	Mon Apr  7 05:10:11 2008
@@ -124,6 +124,23 @@
         }
 }
 
+static double
+get_opacity_for_value (double value)
+{
+        const double start_value = 0.05;
+        const double end_value = 0.33;
+
+        if (value < start_value) {
+                return 0.0;
+        }
+
+        if (value >= end_value) {
+                return 1.0;
+        }
+
+        return ((value - start_value) / (end_value - start_value));
+}
+
 static void
 draw_timer (GdmCellRendererTimer *renderer,
             cairo_t              *context,
@@ -133,22 +150,38 @@
             int                   height)
 {
         double radius;
+        double opacity;
+
+        opacity = get_opacity_for_value (renderer->priv->value);
+
+        if (opacity <= G_MINDOUBLE) {
+                return;
+        }
 
         radius = .5 * (MIN (width, height) / 2.0);
 
         cairo_translate (context, width / 2., height / 2.);
 
-        gdk_cairo_set_source_color (context, bg);
+        cairo_set_source_rgba (context,
+                               fg->red / 65535.0,
+                               fg->green / 65535.0,
+                               fg->blue / 65535.0,
+                               opacity);
+
         cairo_move_to (context, 0, 0);
-        cairo_arc (context, 0, 0, radius, 0, 2 * G_PI);
-        cairo_fill_preserve (context);
-        cairo_stroke (context);
+        cairo_arc (context, 0, 0, radius + 1, 0, 2 * G_PI);
+        cairo_fill (context);
 
-        gdk_cairo_set_source_color (context, fg);
+        cairo_set_operator (context, CAIRO_OPERATOR_SOURCE);
+        cairo_set_source_rgb (context,
+                              bg->red / 65535.0,
+                              bg->green / 65535.0,
+                              bg->blue / 65535.0);
         cairo_move_to (context, 0, 0);
         cairo_arc (context, 0, 0, radius, - G_PI / 2,
                    renderer->priv->value * 2 * G_PI - G_PI / 2);
-        cairo_fill (context);
+        cairo_clip (context);
+        cairo_paint_with_alpha (context, opacity);
 }
 
 static void
@@ -195,8 +228,8 @@
         }
 
         draw_timer (renderer, context,
-                    &widget->style->base[widget_state],
                     &widget->style->text_aa[widget_state],
+                    &widget->style->base[widget_state],
                     cell_area->width, cell_area->height);
 
         cairo_destroy (context);