[libchamplain] Remove some unnecessary queue_relayout()s



commit e67f166064edeb97739f4a140bd3c7f63deeb93f
Author: JiÅ?í Techet <techet gmail com>
Date:   Sat Feb 26 01:33:34 2011 +0100

    Remove some unnecessary queue_relayout()s

 champlain/champlain-custom-marker.c |    2 --
 champlain/champlain-marker-layer.c  |    6 ------
 champlain/champlain-path-layer.c    |    5 +----
 champlain/champlain-point.c         |    2 --
 champlain/champlain-view.c          |    2 --
 5 files changed, 1 insertions(+), 16 deletions(-)
---
diff --git a/champlain/champlain-custom-marker.c b/champlain/champlain-custom-marker.c
index dbfa593..3dd3999 100644
--- a/champlain/champlain-custom-marker.c
+++ b/champlain/champlain-custom-marker.c
@@ -77,7 +77,6 @@ add_actor (ClutterContainer *container,
   ChamplainCustomMarkerPrivate *priv = GET_PRIVATE (container);
   
   clutter_container_add_actor (priv->content_group, actor);  
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (container));
 }
 
 static void
@@ -87,7 +86,6 @@ remove_actor (ClutterContainer *container,
   ChamplainCustomMarkerPrivate *priv = GET_PRIVATE (container);
   
   clutter_container_remove_actor (priv->content_group, actor);  
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (container));
 }
 
 static void
diff --git a/champlain/champlain-marker-layer.c b/champlain/champlain-marker-layer.c
index 8601183..d69ed45 100644
--- a/champlain/champlain-marker-layer.c
+++ b/champlain/champlain-marker-layer.c
@@ -393,8 +393,6 @@ set_marker_position (ChamplainMarkerLayer *layer, ChamplainMarker *marker)
     champlain_location_get_latitude (CHAMPLAIN_LOCATION (marker))) + origin_y;
 
   clutter_actor_set_position (CLUTTER_ACTOR (marker), x, y);
-
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (layer));
 }
 
 
@@ -462,7 +460,6 @@ champlain_marker_layer_add_marker (ChamplainMarkerLayer *layer,
       
   clutter_container_add_actor (CLUTTER_CONTAINER (priv->content_group), CLUTTER_ACTOR (marker));
   set_marker_position (layer, marker);
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (layer));
 }
 
 
@@ -497,7 +494,6 @@ void champlain_marker_layer_remove_all (ChamplainMarkerLayer *layer)
 
   champlain_group_remove_all (CHAMPLAIN_GROUP (priv->content_group));
   g_list_free (markers);
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (layer));
 }
 
 
@@ -582,7 +578,6 @@ champlain_marker_layer_remove_marker (ChamplainMarkerLayer *layer,
       G_CALLBACK (marker_position_notify), layer);
 
   clutter_container_remove_actor (CLUTTER_CONTAINER (priv->content_group), CLUTTER_ACTOR (marker));
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (layer));
 }
 
 
@@ -878,7 +873,6 @@ relocate (ChamplainMarkerLayer *layer)
     }
 
   g_list_free (markers);
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (layer));
 }
 
 
diff --git a/champlain/champlain-path-layer.c b/champlain/champlain-path-layer.c
index 8b61c10..e73e878 100644
--- a/champlain/champlain-path-layer.c
+++ b/champlain/champlain-path-layer.c
@@ -687,10 +687,7 @@ redraw_path (ChamplainPathLayer *layer)
   clutter_cairo_texture_get_surface_size (CLUTTER_CAIRO_TEXTURE (priv->path_actor), &last_width, &last_height);
 
   if ((guint)width != last_width || (guint)height != last_height)
-    {
-      clutter_cairo_texture_set_surface_size (CLUTTER_CAIRO_TEXTURE (priv->path_actor), width, height);
-      clutter_actor_queue_relayout (CLUTTER_ACTOR (layer));
-    }
+    clutter_cairo_texture_set_surface_size (CLUTTER_CAIRO_TEXTURE (priv->path_actor), width, height);
 
   champlain_view_get_viewport_origin (priv->view, &x, &y);
   clutter_actor_set_position (priv->path_actor, x, y);
diff --git a/champlain/champlain-point.c b/champlain/champlain-point.c
index 446075b..c565a8b 100644
--- a/champlain/champlain-point.c
+++ b/champlain/champlain-point.c
@@ -243,8 +243,6 @@ draw_point (ChamplainPoint *point)
   cairo_stroke (cr);
 
   cairo_destroy (cr);
-
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (point));
 }
 
 
diff --git a/champlain/champlain-view.c b/champlain/champlain-view.c
index 91ee568..f6cbbc5 100644
--- a/champlain/champlain-view.c
+++ b/champlain/champlain-view.c
@@ -1682,7 +1682,6 @@ champlain_view_add_layer (ChamplainView *view,
       CLUTTER_ACTOR (layer));
   champlain_layer_set_view (layer, view);
   clutter_actor_raise_top (CLUTTER_ACTOR (layer));
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (view));
 }
 
 
@@ -1708,7 +1707,6 @@ champlain_view_remove_layer (ChamplainView *view,
 
   clutter_container_remove_actor (CLUTTER_CONTAINER (view->priv->user_layers),
       CLUTTER_ACTOR (layer));
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (view));
 }
 
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]