[cluttermm] Actor, Animation: Updated signals and propeties for clutter 1.2.



commit 6975af92dabd7aef58d2e5a5e85e720271ac73dd
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Apr 19 23:26:20 2010 +0200

    Actor, Animation: Updated signals and propeties for clutter 1.2.
    
    * clutter/src/actor.hg: Added new signals and new properties, correcting
    types of existing properties.
    * clutter/src/animation.hg: Added new properties.

 ChangeLog                |    8 ++++++++
 clutter/src/actor.hg     |   33 ++++++++++++++++++++++++---------
 clutter/src/animation.hg |   11 +++++++++++
 3 files changed, 43 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c27e4bc..e9396da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-19  Murray Cumming  <murrayc murrayc com>
+
+	Actor, Animation: Updated signals and propeties for clutter 1.2.
+	
+	* clutter/src/actor.hg: Added new signals and new properties, correcting 
+	types of existing properties.
+	* clutter/src/animation.hg: Added new properties.
+
 2010-04-18  Murray Cumming  <murrayc murrayc com>
 
 	Wrapped more new clutter 1.2 API.
diff --git a/clutter/src/actor.hg b/clutter/src/actor.hg
index 2d003f2..aa100cf 100644
--- a/clutter/src/actor.hg
+++ b/clutter/src/actor.hg
@@ -279,23 +279,34 @@ public:
   _WRAP_SIGNAL(bool captured_event(Event* event), "captured_event")
   _WRAP_SIGNAL(void paint(), "paint")
   _WRAP_SIGNAL(void queue_redaw(const Glib::RefPtr<Actor>& origin), "queue_redraw")
+  _WRAP_SIGNAL(void queue_relayout(), "queue_relayout")
   _WRAP_SIGNAL(void realize(), "realize")
   _WRAP_SIGNAL(void unrealize(), "unrealize")
 
+#m4 _CONVERSION(`const ClutterColor*', `const Color&', `Color(const_cast<ClutterColor*>($3), true)')
+  _WRAP_SIGNAL(void pick(const Color& color), "pick")
+
+#m4 _CONVERSION(`ClutterActorBox*', `const ActorBox&', `ActorBox(const_cast<ClutterActorBox*>($3))')
+  _WRAP_SIGNAL(void allocation_changed(const ActorBox& box, AllocationFlags flags), "allocation-changed", no_default_handler)
+
   _WRAP_PROPERTY("allocation", ActorBox)
-  _WRAP_PROPERTY("anchor-x", int)
-  _WRAP_PROPERTY("anchor-y", int)
+  _WRAP_PROPERTY("anchor-x", float)
+  _WRAP_PROPERTY("anchor-y", float)
+  _WRAP_PROPERTY("anchor-gravity", Gravity)
   _WRAP_PROPERTY("clip", Geometry)
-  _WRAP_PROPERTY("depth", int)
+  _WRAP_PROPERTY("clip-to-allocation", bool)
+  _WRAP_PROPERTY("depth", float)
   _WRAP_PROPERTY("fixed-position-set", bool)
   _WRAP_PROPERTY("fixed-x", float)
   _WRAP_PROPERTY("fixed-y", float)
   _WRAP_PROPERTY("has-clip", bool)
-  _WRAP_PROPERTY("height", int)
+  _WRAP_PROPERTY("has-pointer", bool)
+  _WRAP_PROPERTY("height", float)
   _WRAP_PROPERTY("min-height", float)
   _WRAP_PROPERTY("min-height-set", bool)
   _WRAP_PROPERTY("min-width", float)
   _WRAP_PROPERTY("min-width-set", bool)
+  _WRAP_PROPERTY("name", Glib::ustring)
   _WRAP_PROPERTY("opacity", guint8)
   _WRAP_PROPERTY("reactive", bool)
   _WRAP_PROPERTY("request-mode", RequestMode)
@@ -305,27 +316,31 @@ public:
   _WRAP_PROPERTY("rotation-center-x", Vertex)
   _WRAP_PROPERTY("rotation-center-y", Vertex)
   _WRAP_PROPERTY("rotation-center-z", Vertex)
+  _WRAP_PROPERTY("rotation-center-z-gravity", Gravity)
   _WRAP_PROPERTY("scale-x", double)
   _WRAP_PROPERTY("scale-y", double)
+  _WRAP_PROPERTY("scale-center-x", double)
+  _WRAP_PROPERTY("scale-center-y", double)
+  _WRAP_PROPERTY("scale-gravity", Gravity)
   _WRAP_PROPERTY("show-on-set-parent", bool)
+  _WRAP_PROPERTY("text-direction", TextDirection)
   _WRAP_PROPERTY("visible", bool)
-  _WRAP_PROPERTY("width", int)
-  _WRAP_PROPERTY("x", int)
-  _WRAP_PROPERTY("y", int)
+  _WRAP_PROPERTY("width", float)
+  _WRAP_PROPERTY("x", float)
+  _WRAP_PROPERTY("y", float)
 
 protected:
   _WRAP_METHOD(void set_shader_param_value(const Glib::ustring& param, const Glib::ValueBase& value),
                clutter_actor_set_shader_param)
 
+  //TODO: Add new vfuncs.
   _WRAP_VFUNC(void show_all(), "show_all")
   _WRAP_VFUNC(void hide_all(), "hide_all")
 
-  #m4 _CONVERSION(`const ClutterColor*', `const Color&', `Color(const_cast<ClutterColor*>($3), true)')
   // TODO: I think we need to hand-code the vfuncs if we need to handle
   // the float* being NULL.
   #m4 _CONVERSION(`float*', `float&', `*($3)')
   #m4 _CONVERSION(`const ClutterActorBox*', `const ActorBox&', `Glib::wrap($3)')
-  _WRAP_VFUNC(void pick(const Color& color), "pick")
   _WRAP_VFUNC(void get_preferred_width(float for_height, float& min_width_p, float& natural_width_p) const, "get_preferred_width")
   _WRAP_VFUNC(void get_preferred_height(float for_width, float& min_height_p, float& natural_height_p) const, "get_preferred_height")
   _WRAP_VFUNC(void allocate(const ActorBox& box, AllocationFlags absolute_origin_changed), "allocate")
diff --git a/clutter/src/animation.hg b/clutter/src/animation.hg
index 2a22bd0..6207f6b 100644
--- a/clutter/src/animation.hg
+++ b/clutter/src/animation.hg
@@ -44,8 +44,11 @@ public:
   _WRAP_METHOD(Glib::RefPtr<const Glib::Object> get_object() const, clutter_animation_get_object)
   _WRAP_METHOD(void set_mode(gulong mode), clutter_animation_set_mode)
   _WRAP_METHOD(gulong get_mode() const, clutter_animation_get_mode)
+
+  //See http://bugzilla.o-hand.com/show_bug.cgi?id=2089 about the gint/guint difference.
   _WRAP_METHOD(void set_duration(int msecs), clutter_animation_set_duration)
   _WRAP_METHOD(guint get_duration() const, clutter_animation_get_duration)
+  
   _WRAP_METHOD(void set_loop(bool loop=true), clutter_animation_set_loop)
   _WRAP_METHOD(bool get_loop() const, clutter_animation_get_loop)
   _WRAP_METHOD(void set_timeline(const Glib::RefPtr<Timeline>& timeline), clutter_animation_set_timeline)
@@ -68,6 +71,14 @@ public:
 
   _WRAP_SIGNAL(void started(), "started")
   _WRAP_SIGNAL(void completed(), "completed")
+  
+  _WRAP_PROPERTY("object", Glib::RefPtr<Glib::Object>)
+  _WRAP_PROPERTY("mode", gulong)
+  _WRAP_PROPERTY("duration", guint)
+  _WRAP_PROPERTY("loop", bool)
+  _WRAP_PROPERTY("timeline", Glib::RefPtr<Timeline>)
+  _WRAP_PROPERTY("alpha", Glib::RefPtr<Alpha>)
+                               
 };
 
 } // namespace Clutter



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