2007-10-17 Emmanuele Bassi <ebassi@openedhand.com>

* clutter/clutter-actor.c:
	(clutter_actor_set_property), (clutter_actor_get_property),
	(clutter_actor_class_init): Add the :reactive property, to
	control reactiveness using the UI definition files.

	(clutter_actor_reparent): Do not assume the parent is a
	ClutterContainer, and call the container API only if needed.

	(clutter_actor_destroy): Remove from the parent if needed,
	just like the documentation says.

ChangeLog

@@ -1,3 +1,16 @@
+2007-10-17  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/clutter-actor.c:
+	(clutter_actor_set_property), (clutter_actor_get_property),
+	(clutter_actor_class_init): Add the :reactive property, to
+	control reactiveness using the UI definition files.
+
+	(clutter_actor_reparent): Do not assume the parent is a
+	ClutterContainer, and call the container API only if needed.
+
+	(clutter_actor_destroy): Remove from the parent if needed,
+	just like the documentation says.
+
 2007-10-16  Øyvind Kolås  <pippin@o-hand.com>
 
 	* clutter/pango/pangoclutter-render.c: (tc_get): Provide for blank

clutter/clutter-actor.c

@@ -113,7 +113,8 @@ enum
   PROP_NAME,
   PROP_VISIBLE,
   PROP_SCALE_X,
-  PROP_SCALE_Y
+  PROP_SCALE_Y,
+  PROP_REACTIVE
 };
 
 enum
@@ -943,6 +944,12 @@ clutter_actor_set_property (GObject      *object,
 				geom->width, geom->height);
       }
       break;
+    case PROP_REACTIVE:
+      if (g_value_get_boolean (value) == TRUE)
+        clutter_actor_set_reactive (actor);
+      else
+        clutter_actor_unset_reactive (actor);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1000,6 +1007,10 @@ clutter_actor_get_property (GObject    *object,
     case PROP_SCALE_Y:
       g_value_set_double (value, CLUTTER_FIXED_TO_DOUBLE (priv->scale_y));
       break;
+    case PROP_REACTIVE:
+      g_value_set_boolean (value,
+                           (CLUTTER_ACTOR_IS_REACTIVE (actor) != FALSE));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1141,6 +1152,20 @@ clutter_actor_class_init (ClutterActorClass *klass)
                                                          "Whether the actor is visible or not",
                                                          FALSE,
                                                          CLUTTER_PARAM_READWRITE));
+  /**
+   * ClutterActor:reactive:
+   *
+   * Whether the actor is reactive to events or not.
+   *
+   * Since: 0.6
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_REACTIVE,
+                                   g_param_spec_boolean ("reactive",
+                                                         "Reactive",
+                                                         "Whether the actor is reactive to events or not",
+                                                         FALSE,
+                                                         CLUTTER_PARAM_READWRITE));
   /**
    * ClutterActor:has-clip:
    *
@@ -1569,6 +1594,19 @@ clutter_actor_destroy (ClutterActor *self)
 {
   g_return_if_fail (CLUTTER_IS_ACTOR (self));
 
+  if (self->priv->parent_actor)
+    {
+      ClutterActor *parent = self->priv->parent_actor;
+
+      if (CLUTTER_IS_CONTAINER (parent))
+        {
+          g_object_ref (self);
+          clutter_container_remove_actor (CLUTTER_CONTAINER (parent), self);
+        }
+      else
+        self->priv->parent_actor = NULL;
+    }
+
   if (!(CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IN_DESTRUCTION))
     g_object_run_dispose (G_OBJECT (self));
 }
@@ -2900,9 +2938,16 @@ clutter_actor_reparent (ClutterActor *self,
       g_object_ref (self);
 
       /* FIXME: below assumes only containers can reparent */
+      if (CLUTTER_IS_CONTAINER (priv->parent_actor))
         clutter_container_remove_actor (CLUTTER_CONTAINER (priv->parent_actor),
                                         self);
+      else
+        priv->parent_actor = NULL;
+
+      if (CLUTTER_IS_CONTAINER (new_parent))
         clutter_container_add_actor (CLUTTER_CONTAINER (new_parent), self);
+      else
+        priv->parent_actor = new_parent;
 
       g_object_unref (self);