X-Git-Url: http://git.code-monkey.de/?p=ruby-edje.git;a=blobdiff_plain;f=src%2Frb_part.c;h=bfc664cd903e4e8e0de0b1f6273a3800a19a1f62;hp=563be555b6430020945c92e24248e5d9ad7b6959;hb=a405c57ad4ce8be9ab99b97464cbfe69a00853a3;hpb=3a9c35673bdd0dc885f7474865be23d6d0061789

diff --git a/src/rb_part.c b/src/rb_part.c
index 563be55..bfc664c 100644
--- a/src/rb_part.c
+++ b/src/rb_part.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_part.c 51 2004-08-01 10:19:02Z tilman $
+ * $Id: rb_part.c 113 2004-10-10 10:00:07Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -67,7 +67,13 @@ VALUE TO_PART (VALUE edje, VALUE name)
 	return self;
 }
 
-static VALUE c_get_geometry (VALUE self)
+/*
+ * call-seq:
+ *  part.geometry => array
+ *
+ * Returns an array containing the geometry of <i>part</i>.
+ */
+static VALUE c_geometry_get (VALUE self)
 {
 	int x = 0, y = 0, w = 0, h = 0;
 
@@ -83,6 +89,12 @@ static VALUE c_get_geometry (VALUE self)
 	                    INT2FIX (y), INT2FIX (h));
 }
 
+/*
+ * call-seq:
+ *  part.swallow(evasobject) => nil
+ *
+ * Swallows an <code>Evas::EvasObject</code> into <i>part</i>.
+ */
 static VALUE c_swallow (VALUE self, VALUE target)
 {
 	GET_OBJ (GET_EDJE (self), RbEdje, e);
@@ -91,10 +103,18 @@ static VALUE c_swallow (VALUE self, VALUE target)
 	GET_OBJ (target, RbEvasObject, t);
 
 	edje_object_part_swallow (e->real.real, GET_NAME (self), t->real);
+	rb_iv_set (self, "swallowed_obj", target);
 
 	return Qnil;
 }
 
+/*
+ * call-seq:
+ *  part.unswallow => nil
+ *
+ * Unswallows the <code>Evas::EvasObject</code> swallowed by
+ * <i>part</i>.
+ */
 static VALUE c_unswallow (VALUE self)
 {
 	Evas_Object *o;
@@ -108,14 +128,22 @@ static VALUE c_unswallow (VALUE self)
 	}
 
 	edje_object_part_unswallow (e->real.real, o);
+	rb_iv_set (self, "swallowed_obj", Qnil);
 
 	return Qnil;
 }
 
+/*
+ * call-seq:
+ *  part.swallowed_object => evasobject or nil
+ *
+ * Returns the <code>Evas::EvasObject</code> swallowed by
+ * <i>part</i> or nil if <i>part</i> didn't swallow an
+ * <code>Evas::EvasObject</code>.
+ */
 static VALUE c_swallowed_object_get (VALUE self)
 {
 	Evas_Object *o;
-	void *obj;
 
 	GET_OBJ (GET_EDJE (self), RbEdje, e);
 
@@ -123,14 +151,15 @@ static VALUE c_swallowed_object_get (VALUE self)
 	if (!o)
 		return Qnil;
 
-	if (!(obj = evas_object_data_get (o, RUBY_EVAS_OBJECT_KEY))) {
-		rb_raise (rb_eException, "EvasObject Ruby object key missing");
-		return Qnil;
-	}
-
-	return (VALUE) obj;
+	return TO_EVAS_OBJECT (o);
 }
 
+/*
+ * call-seq:
+ *  part.text => string
+ *
+ * Returns the text of <i>part</i>.
+ */
 static VALUE c_text_get (VALUE self)
 {
 	const char *s;
@@ -142,6 +171,12 @@ static VALUE c_text_get (VALUE self)
 	return s ? rb_str_new2 (s) : Qnil;
 }
 
+/*
+ * call-seq:
+ *  part.text(string)
+ *
+ * Sets the text of <i>part</i>.
+ */
 static VALUE c_text_set (VALUE self, VALUE text)
 {
 	GET_OBJ (GET_EDJE (self), RbEdje, e);
@@ -154,6 +189,15 @@ static VALUE c_text_set (VALUE self, VALUE text)
 	return Qnil;
 }
 
+/*
+ * call-seq:
+ *  part.get_drag_value => array
+ *
+ * Returns the drag value of <i>part</i>.
+ *
+ *  part.set_drag_value(1.5, 2.5) #=> nil
+ *  part.get_drag_value           #=> [1.5, 2.5]
+ */
 static VALUE c_get_drag_value (VALUE self)
 {
 	double dx = 0, dy = 0;
@@ -165,6 +209,14 @@ static VALUE c_get_drag_value (VALUE self)
 	return rb_ary_new3 (2, rb_float_new (dx), rb_float_new (dy));
 }
 
+/*
+ * call-seq:
+ *  part.set_drag_value(dx, dy) => nil
+ *
+ * Sets the drag value of <i>part</i>.
+ *
+ *  part.set_drag_value(1.5, 2.5) #=> nil
+ */
 static VALUE c_set_drag_value (VALUE self, VALUE dx, VALUE dy)
 {
 	GET_OBJ (GET_EDJE (self), RbEdje, e);
@@ -191,13 +243,13 @@ void Init_Part (void)
 	/* not publically instantiable yet */
 	rb_define_private_method (rb_singleton_class (cPart),
 	                          "new", NULL, 0);
-	rb_define_method (cPart, "get_geometry", c_get_geometry, 0);
+	rb_define_method (cPart, "geometry", c_geometry_get, 0);
 	rb_define_method (cPart, "swallow", c_swallow, 1);
 	rb_define_method (cPart, "unswallow", c_unswallow, 1);
 	rb_define_method (cPart, "swallowed_object",
 	                  c_swallowed_object_get, 0);
 	rb_define_method (cPart, "text", c_text_get, 0);
 	rb_define_method (cPart, "text=", c_text_set, 1);
-	rb_define_method (cPart, "get_drag_value", c_get_drag_value, 2);
+	rb_define_method (cPart, "get_drag_value", c_get_drag_value, 0);
 	rb_define_method (cPart, "set_drag_value", c_set_drag_value, 2);
 }