X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Frb_gradient.c;h=f5ad6a01fe5c9ee244b2c1af865e358c58ba42c4;hb=97880d40d2ed6c446a5ca733e70bba093306a304;hp=2129e01235b8b96f7aa223042ebed2c9cde77983;hpb=1f6059ba8be27832fc4b6f88c99548e39f4264cb;p=ruby-evas.git

diff --git a/src/rb_gradient.c b/src/rb_gradient.c
index 2129e01..f5ad6a0 100644
--- a/src/rb_gradient.c
+++ b/src/rb_gradient.c
@@ -1,7 +1,5 @@
 /*
- * $Id: rb_gradient.c 58 2004-08-10 14:10:02Z tilman $
- *
- * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
+ * Copyright (C) 2004-2007 Tilman Sauerbeck (tilman at code-monkey de)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -26,31 +24,21 @@
 #include "rb_evas.h"
 #include "rb_evas_object.h"
 
-static void c_free (RbEvasObject *e)
-{
-	c_evas_object_free (e, true);
-}
-
 /*
  * call-seq:
  *  Evas::Gradient.new(evas) => gradient
  *
  * Creates an Evas::Gradient object.
  */
-static VALUE c_new (VALUE klass, VALUE evas)
+static VALUE c_init (VALUE self, VALUE evas)
 {
-	VALUE self, argv[1];
-	RbEvasObject *rect;
-
 	CHECK_CLASS (evas, cEvas);
 	GET_OBJ (evas, RbEvas, e);
+	GET_OBJ (self, RbEvasObject, grad);
 
-	self = Data_Make_Struct (klass, RbEvasObject, c_evas_object_mark,
-	                         c_free, rect);
-	rect->real = evas_object_gradient_add (e->real);
+	grad->real = evas_object_gradient_add (e->real);
 
-	argv[0] = evas;
-	rb_obj_call_init (self, 1, argv);
+	rb_call_super (1, &evas);
 
 	return self;
 }
@@ -72,24 +60,37 @@ static VALUE c_add_color (VALUE self, VALUE r, VALUE g, VALUE b,
 	Check_Type (a, T_FIXNUM);
 	Check_Type (distance, T_FIXNUM);
 
-	evas_object_gradient_color_add (e->real, FIX2INT (r), FIX2INT (g),
-	                                FIX2INT (b), FIX2INT (a),
-	                                FIX2INT (distance));
+	evas_object_gradient_color_stop_add (e->real, FIX2INT (r),
+	                                     FIX2INT (g), FIX2INT (b),
+	                                     FIX2INT (a), FIX2INT (distance));
+
+	return Qnil;
+}
+
+static VALUE c_add_alpha (VALUE self, VALUE a, VALUE distance)
+{
+	GET_OBJ (self, RbEvasObject, e);
+
+	Check_Type (a, T_FIXNUM);
+	Check_Type (distance, T_FIXNUM);
+
+	evas_object_gradient_alpha_stop_add (e->real, FIX2INT (a),
+	                                     FIX2INT (distance));
 
 	return Qnil;
 }
 
 /*
  * call-seq:
- *  gradient.clear_colors => nil
+ *  gradient.clear => nil
  *
- * Clears the colors of <i>gradient</i>.
+ * Clears <i>gradient</i>.
  */
-static VALUE c_clear_colors (VALUE self)
+static VALUE c_clear (VALUE self)
 {
 	GET_OBJ (self, RbEvasObject, e);
 
-	evas_object_gradient_colors_clear (e->real);
+	evas_object_gradient_clear (e->real);
 
 	return Qnil;
 }
@@ -124,13 +125,58 @@ static VALUE c_angle_set (VALUE self, VALUE val)
 	return Qnil;
 }
 
+static VALUE
+c_direction_get (VALUE self)
+{
+	GET_OBJ (self, RbEvasObject, e);
+
+	return INT2FIX (evas_object_gradient_direction_get (e->real));
+}
+
+static VALUE
+c_direction_set (VALUE self, VALUE val)
+{
+	GET_OBJ (self, RbEvasObject, e);
+
+	Check_Type (val, T_FIXNUM);
+
+	evas_object_gradient_direction_set (e->real, FIX2INT (val));
+
+	return Qnil;
+}
+
+static VALUE
+c_offset_get (VALUE self)
+{
+	GET_OBJ (self, RbEvasObject, e);
+
+	return rb_float_new (evas_object_gradient_offset_get (e->real));
+}
+
+static VALUE
+c_offset_set (VALUE self, VALUE val)
+{
+	GET_OBJ (self, RbEvasObject, e);
+
+	Check_Type (val, T_FLOAT);
+
+	evas_object_gradient_offset_set (e->real, NUM2DBL (val));
+
+	return Qnil;
+}
+
 void Init_Gradient (void)
 {
 	VALUE c = rb_define_class_under (mEvas, "Gradient", cEvasObject);
 
-	rb_define_singleton_method (c, "new", c_new, 1);
+	rb_define_method (c, "initialize", c_init, 1);
 	rb_define_method (c, "add_color", c_add_color, 5);
-	rb_define_method (c, "clear_colors", c_clear_colors, 0);
+	rb_define_method (c, "add_alpha", c_add_alpha, 2);
+	rb_define_method (c, "clear", c_clear, 0);
 	rb_define_method (c, "angle", c_angle_get, 0);
 	rb_define_method (c, "angle=", c_angle_set, 1);
+	rb_define_method (c, "direction", c_direction_get, 0);
+	rb_define_method (c, "direction=", c_direction_set, 1);
+	rb_define_method (c, "offset", c_offset_get, 0);
+	rb_define_method (c, "offset=", c_offset_set, 1);
 }