Merge "(C#) Changed Rectangle to have float properties" into devel/master

diff --git a/plugins/dali-swig/SWIG/events/rectangle.i b/plugins/dali-swig/SWIG/events/rectangle.i
index b9e9c95..0d7f7b7 100644 (file)
--- a/plugins/dali-swig/SWIG/events/rectangle.i
+++ b/plugins/dali-swig/SWIG/events/rectangle.i
@@ -25,6 +25,10 @@
 
 %define DALI_RECTANGLE_PROPERTY_PARAM(NameSpace,ClassName)
   %typemap(cscode) NameSpace::ClassName %{
+    public Rectangle(float x, float y, float width, float height) : this( (int)x, (int)y, (int)width, (int)height )
+    {
+    }
+
     public static bool operator ==(Rectangle a, Rectangle b)
     {
         // If both are null, or both are same instance, return true.
@@ -48,12 +52,12 @@
         return !(a == b);
     }
 
-    ///< X position of the rectangle
-    public int X
+    ///< X position of the rectangle, values after the decimal point are ignored, float type provided for convenience.
+    public float X
     {
         set
         {
-            x = value;
+            x = (int)( value );
         }
         get
         {
@@ -61,12 +65,12 @@
         }
     }
 
-    ///< Y position of the rectangle
-    public int Y
+    ///< Y position of the rectangle, values after the decimal point are ignored, float type provided for convenience.
+    public float Y
     {
         set
         {
-            y = value;
+            y = (int)( value );
         }
         get
         {
@@ -74,12 +78,12 @@
         }
     }
 
-    ///< Width of the rectangle
-    public int Width
+    ///< Width of the rectangle, values after the decimal point are ignored, float type provided for convenience.
+    public float Width
     {
         set
         {
-            width = value;
+            width = (int)( value );
         }
         get
         {
@@ -87,12 +91,12 @@
         }
     }
 
-    ///< Height of the rectangle
-    public int Height
+    ///< Height of the rectangle, values after the decimal point are ignored, float type provided for convenience.
+    public float Height
     {
         set
         {
-            height = value;
+            height = (int)( value );
         }
         get
         {

diff --git a/plugins/dali-swig/examples/dali-test.cs b/plugins/dali-swig/examples/dali-test.cs
index 2dbe547..a4a3a1e 100755 (executable)
--- a/plugins/dali-swig/examples/dali-test.cs
+++ b/plugins/dali-swig/examples/dali-test.cs
@@ -206,7 +206,7 @@ namespace MyCSharpExample
 
             Console.WriteLine( " *************************" );
 
-            using (Rectangle r2 = new Rectangle(2, 5, 20, 30))
+            using (Rectangle r2 = new Rectangle(2, 5, 20.0f, 30.0f))
             {
                 Console.WriteLine( "    Created " + r2 );
                 r2.Set(1,1,40,40);