Updated Swedish translation

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

diff --git a/src/empathy-rounded-rectangle.c b/src/empathy-rounded-rectangle.c
index 8e6dab3da36ec03170b26c842f406606a76c985c..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)
@@ -35,58 +32,58 @@ struct _EmpathyRoundedRectanglePriv
   guint width, height;
   ClutterColor border_color;
   guint border_width;
+  guint round_factor;
 };
 
-static void
-empathy_rounded_rectangle_paint (EmpathyRoundedRectangle *self)
+static gboolean
+draw_cb (ClutterCairoTexture *canvas,
+    cairo_t *cr)
 {
+  EmpathyRoundedRectangle *self = EMPATHY_ROUNDED_RECTANGLE (canvas);
   guint width, height;
-  guint tmp_alpha;
-  cairo_t *cr;
-
-#define RADIUS (height / 8.)
+  guint border_width;
+  gdouble tmp_alpha;
+  gdouble radius;
 
   width = self->priv->width;
   height = self->priv->height;
+  radius = self->priv->height / self->priv->round_factor;
+  border_width = self->priv->border_width;
 
   /* 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;
-
-  cr = clutter_cairo_texture_create (CLUTTER_CAIRO_TEXTURE (self));
+  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, self->priv->border_width);
+  cairo_set_line_width (cr, border_width);
 
   cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint (cr);
   cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
 
   /* make room for the portion of the border drawn on the outside */
-  cairo_translate (cr, self->priv->border_width/2.0, self->priv->border_width/2.0);
+  cairo_translate (cr, border_width/2.0, border_width/2.0);
 
   cairo_new_sub_path (cr);
-  cairo_arc (cr, width - RADIUS, RADIUS, RADIUS,
+  cairo_arc (cr, width - radius, radius, radius,
       -M_PI/2.0, 0);
-  cairo_arc (cr, width - RADIUS, height - RADIUS, RADIUS,
+  cairo_arc (cr, width - radius, height - radius, radius,
       0, M_PI/2.0);
-  cairo_arc (cr, RADIUS, height - RADIUS, RADIUS,
+  cairo_arc (cr, radius, height - radius, radius,
       M_PI/2.0, M_PI);
-  cairo_arc (cr, RADIUS, RADIUS, RADIUS,
+  cairo_arc (cr, radius, radius, radius,
       M_PI, -M_PI/2.0);
   cairo_close_path (cr);
 
   cairo_stroke (cr);
-  cairo_destroy (cr);
 
-#undef RADIUS
+  return TRUE;
 }
 
 static void
@@ -96,11 +93,22 @@ empathy_rounded_rectangle_init (EmpathyRoundedRectangle *self)
       EMPATHY_TYPE_ROUNDED_RECTANGLE, EmpathyRoundedRectanglePriv);
 
   self->priv->border_width = 1;
+  self->priv->round_factor = 2;
+}
+
+static void
+empathy_rounded_rectangle_finalize (GObject *object)
+{
+  G_OBJECT_CLASS (empathy_rounded_rectangle_parent_class)->finalize (object);
 }
 
 static void
 empathy_rounded_rectangle_class_init (EmpathyRoundedRectangleClass *klass)
 {
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->finalize = empathy_rounded_rectangle_finalize;
+
   g_type_class_add_private (klass, sizeof (EmpathyRoundedRectanglePriv));
 }
 
@@ -112,9 +120,10 @@ empathy_rounded_rectangle_update_surface_size (EmpathyRoundedRectangle *self)
       self->priv->height + self->priv->border_width);
 }
 
-ClutterActor *
+EmpathyRoundedRectangle *
 empathy_rounded_rectangle_new (guint width,
-    guint height)
+    guint height,
+    guint round_factor)
 {
   EmpathyRoundedRectangle *self;
 
@@ -122,11 +131,14 @@ empathy_rounded_rectangle_new (guint width,
 
   self->priv->width = width;
   self->priv->height = height;
+  self->priv->round_factor = round_factor;
+
+  g_signal_connect (self, "draw", G_CALLBACK (draw_cb), NULL);
 
   empathy_rounded_rectangle_update_surface_size (self);
-  empathy_rounded_rectangle_paint (self);
+  clutter_cairo_texture_invalidate (CLUTTER_CAIRO_TEXTURE (self));
 
-  return CLUTTER_ACTOR (self);
+  return self;
 }
 
 void
@@ -136,7 +148,7 @@ empathy_rounded_rectangle_set_border_width (EmpathyRoundedRectangle *self,
   self->priv->border_width = border_width;
 
   empathy_rounded_rectangle_update_surface_size (self);
-  empathy_rounded_rectangle_paint (self);
+  clutter_cairo_texture_invalidate (CLUTTER_CAIRO_TEXTURE (self));
 }
 
 void
@@ -145,5 +157,5 @@ empathy_rounded_rectangle_set_border_color (EmpathyRoundedRectangle *self,
 {
   self->priv->border_color = *color;
 
-  empathy_rounded_rectangle_paint (self);
+  clutter_cairo_texture_invalidate (CLUTTER_CAIRO_TEXTURE (self));
 }