From: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date: Sun, 12 Apr 2009 01:37:54 +0000 (-0400)
Subject: Flip the marker if the alignment is right.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11e98d13f7a70060521a049d64139b4457ff521c;p=libchamplain

Flip the marker if the alignment is right.
---

diff --git a/champlain/champlain-marker.c b/champlain/champlain-marker.c
index 785335f..2fbb9d3 100644
--- a/champlain/champlain-marker.c
+++ b/champlain/champlain-marker.c
@@ -387,14 +387,16 @@ draw_background (ChamplainMarker *marker, int width, int height, int point)
   cairo_arc (cr, RADIUS, RADIUS, RADIUS - 1, M_PI, 3 * M_PI / 2.0);
   cairo_close_path (cr);
 
-  cairo_set_line_width (cr, 1.0);
+  clutter_color_darken (priv->color, &darker_color);
+
   cairo_set_source_rgba (cr,
       priv->color->red / 255.0,
       priv->color->green / 255.0,
       priv->color->blue / 255.0,
       priv->color->alpha / 255.0);
   cairo_fill_preserve (cr);
-  clutter_color_darken (priv->color, &darker_color);
+
+  cairo_set_line_width (cr, 1.0);
   cairo_set_source_rgba (cr,
       darker_color.red / 255.0,
       darker_color.green / 255.0,
@@ -403,6 +405,9 @@ draw_background (ChamplainMarker *marker, int width, int height, int point)
   cairo_stroke (cr);
   cairo_destroy (cr);
 
+  if (priv->alignment == PANGO_ALIGN_RIGHT)
+    clutter_actor_set_rotation (bg, CLUTTER_Y_AXIS, 180, clutter_actor_get_width (bg) / 2.0, 0, 0);
+
   clutter_container_add_actor (CLUTTER_CONTAINER (marker), bg);
 
   if (priv->background != NULL)
@@ -493,11 +498,16 @@ draw_marker (ChamplainMarker *marker)
     clutter_actor_raise (priv->image, priv->background);
 
   if (priv->draw_background == TRUE)
-    clutter_actor_set_anchor_point (CLUTTER_ACTOR (marker), 0, total_height + point);
+  {
+    if (priv->alignment == PANGO_ALIGN_RIGHT)
+      clutter_actor_set_anchor_point (CLUTTER_ACTOR (marker), total_width, total_height + point);
+    else
+      clutter_actor_set_anchor_point (CLUTTER_ACTOR (marker), 0, total_height + point);
+  }
   else if (priv->image != NULL)
     clutter_actor_set_anchor_point (CLUTTER_ACTOR (marker),
-        clutter_actor_get_width (priv->image) / 2.0,
-        clutter_actor_get_height (priv->image) / 2.0);
+        clutter_actor_get_width (priv->image) / 2.0 + PADDING,
+        clutter_actor_get_height (priv->image) / 2.0 + PADDING);
   else if (priv->text_actor != NULL)
     clutter_actor_set_anchor_point (CLUTTER_ACTOR (marker),
         0,