Reorder header inclusions accordingly to the Telepathy coding style

[empathy.git] / src / empathy-rounded-rectangle.c

diff --git a/src/empathy-rounded-rectangle.c b/src/empathy-rounded-rectangle.c
index 7b8951f80c82530d114e316342a19611a6f11713..810fa0df7376016398930c44313be6bb3f036b55 100644 (file)
--- a/src/empathy-rounded-rectangle.c
+++ b/src/empathy-rounded-rectangle.c
@@ -19,13 +19,10 @@
  */
 
 #include "config.h"
+#include "empathy-rounded-rectangle.h"
 
 #include <math.h>
 
-#include <clutter/clutter.h>
-
-#include "empathy-rounded-rectangle.h"
-
 G_DEFINE_TYPE (EmpathyRoundedRectangle,
     empathy_rounded_rectangle,
     CLUTTER_TYPE_CAIRO_TEXTURE)
@@ -45,7 +42,7 @@ draw_cb (ClutterCairoTexture *canvas,
   EmpathyRoundedRectangle *self = EMPATHY_ROUNDED_RECTANGLE (canvas);
   guint width, height;
   guint border_width;
-  guint tmp_alpha;
+  gdouble tmp_alpha;
   gdouble radius;
 
   width = self->priv->width;
@@ -55,14 +52,13 @@ draw_cb (ClutterCairoTexture *canvas,
 
   /* compute the composited opacity of the actor taking into
    * account the opacity of the color set by the user */
-  tmp_alpha = clutter_actor_get_paint_opacity (CLUTTER_ACTOR (self))
-            * self->priv->border_color.alpha
-            / 255;
+  tmp_alpha = (clutter_actor_get_paint_opacity (CLUTTER_ACTOR (self))
+               * self->priv->border_color.alpha) / 255.;
 
   cairo_set_source_rgba (cr,
-      self->priv->border_color.red,
-      self->priv->border_color.green,
-      self->priv->border_color.blue,
+      self->priv->border_color.red / 255.,
+      self->priv->border_color.green / 255.,
+      self->priv->border_color.blue / 255.,
       tmp_alpha);
 
   cairo_set_line_width (cr, border_width);