X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fdali-swig%2FSWIG%2Fevents%2Fstage-event.i;h=74693cd84914f5c865cd2edb2c5b13ada5d77f3c;hb=fb545906ceea3a2946c8a451f34ea7da283c4ffe;hp=44db9d0f882b957cd731f0cdb1b53028a821d912;hpb=ee431c9e2b342243f9e0e2b6bafca7505d321457;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/plugins/dali-swig/SWIG/events/stage-event.i b/plugins/dali-swig/SWIG/events/stage-event.i index 44db9d0..74693cd 100644 --- a/plugins/dali-swig/SWIG/events/stage-event.i +++ b/plugins/dali-swig/SWIG/events/stage-event.i @@ -20,7 +20,6 @@ using System; using System.Runtime.InteropServices; - %} %enddef @@ -525,21 +524,21 @@ public class SceneCreatedEventArgs : EventArgs } } - ///< name "Size", type Dali.CSharp.Size (Stage Size value) + ///< name "Size", type Dali.Size (Stage Size value) //@since 1.0.0 - public Dali.CSharp.Size Size + public Dali.Size Size { get { Vector2 ret1 = GetSize(); - Dali.CSharp.Size ret= new Dali.CSharp.Size(ret1.width, ret1.height); + Dali.Size ret= new Size(ret1); return ret; } } - ///< name "BackgroundColor", type Dali.CSharp.Color (Stage background color value) + ///< name "BackgroundColor", type Dali.Color (Stage background color value) //@since 1.0.0 - public Dali.CSharp.Color BackgroundColor + public Dali.Color BackgroundColor { set { @@ -548,7 +547,7 @@ public class SceneCreatedEventArgs : EventArgs get { Vector4 ret1 = GetBackgroundColor(); - Dali.CSharp.Color ret = new Dali.CSharp.Color(ret1.r, ret1.g, ret1.b, ret1.a); + Dali.Color ret = new Color(ret1); return ret; } } @@ -565,37 +564,7 @@ public class SceneCreatedEventArgs : EventArgs %enddef -%define DALI_VECTOR4_TO_COLOR_CONVERSION -%typemap(cstype) (Vector4 color) "Dali.CSharp.Color" -%typemap(csin, - pre=" Vector4 temp$csinput = new Vector4($csinput.R, $csinput.G, $csinput.B, $csinput.A);", - cshin="ref $csinput" - ) (Vector4 color) "$csclassname.getCPtr(temp$csinput)" - -%enddef - -%define DALI_CONST_VECTOR3_REF_TO_POSITION_CONVERSION -%typemap(cstype) (const Vector3& position) "Dali.CSharp.Position" -%typemap(csin, - pre=" Vector3 temp$csinput = new Vector3($csinput.X, $csinput.Y, $csinput.Z);", - cshin="ref $csinput" - ) (const Vector3& position) "$csclassname.getCPtr(temp$csinput)" - -%enddef - -%define DALI_CONST_VECTOR3_TO_POSITION_CONVERSION -%typemap(cstype) (const Vector3) "Dali.CSharp.Position" -%typemap(csin, - pre=" Vector3 temp$csinput = new Vector3($csinput.X, $csinput.Y, $csinput.Z);", - cshin="ref $csinput" - ) (const Vector3) "$csclassname.getCPtr(temp$csinput)" - -%enddef - namespace Dali { DALI_STAGE_EVENTHANDLER_PARAM( Dali, Stage); - DALI_VECTOR4_TO_COLOR_CONVERSION; - DALI_CONST_VECTOR3_REF_TO_POSITION_CONVERSION; - DALI_CONST_VECTOR3_TO_POSITION_CONVERSION; }