Merge "Renamed TextVisual::DoSetProperty to SetProperty" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 24 Nov 2016 14:46:47 +0000 (06:46 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 24 Nov 2016 14:46:47 +0000 (06:46 -0800)
52 files changed:
automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
dali-toolkit/devel-api/controls/popup/popup.h
dali-toolkit/internal/controls/popup/popup-impl.cpp
dali-toolkit/internal/controls/popup/popup-impl.h
dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
dali-toolkit/styles/images-common/00_popup_bg.9.png
plugins/dali-swig/Makefile.am
plugins/dali-swig/README
plugins/dali-swig/SWIG/cameraActor.i [deleted file]
plugins/dali-swig/SWIG/dali-core.i
plugins/dali-swig/SWIG/dali-toolkit.i
plugins/dali-swig/SWIG/dali.i
plugins/dali-swig/SWIG/events/actor-event.i
plugins/dali-swig/SWIG/events/button-event.i
plugins/dali-swig/SWIG/events/control-event.i
plugins/dali-swig/SWIG/events/itemview-event.i
plugins/dali-swig/SWIG/events/pageturnview-event.i
plugins/dali-swig/SWIG/events/pangesture-event.i
plugins/dali-swig/SWIG/events/popup-event.i
plugins/dali-swig/SWIG/events/rendertask-event.i
plugins/dali-swig/SWIG/events/scrollable-event.i
plugins/dali-swig/SWIG/events/scrollbar-event.i
plugins/dali-swig/SWIG/events/scrollview-event.i
plugins/dali-swig/SWIG/events/slider-event.i
plugins/dali-swig/SWIG/events/stage-event.i
plugins/dali-swig/SWIG/events/texteditor-event.i
plugins/dali-swig/SWIG/events/textfield-event.i
plugins/dali-swig/SWIG/events/videoview-event.i
plugins/dali-swig/SWIG/flexContainer.i [deleted file]
plugins/dali-swig/SWIG/imageView.i [deleted file]
plugins/dali-swig/SWIG/layer.i [deleted file]
plugins/dali-swig/SWIG/linearConstrainer.i [deleted file]
plugins/dali-swig/SWIG/model3DView.i [deleted file]
plugins/dali-swig/SWIG/pageTurnLandscapeView.i [deleted file]
plugins/dali-swig/SWIG/pageTurnPortraitView.i [deleted file]
plugins/dali-swig/SWIG/path.i [deleted file]
plugins/dali-swig/SWIG/pathConstrainer.i [deleted file]
plugins/dali-swig/SWIG/progressBar.i [deleted file]
plugins/dali-swig/SWIG/propertyValue.i [deleted file]
plugins/dali-swig/SWIG/pushButton.i [deleted file]
plugins/dali-swig/SWIG/renderer.i [deleted file]
plugins/dali-swig/SWIG/shader.i [deleted file]
plugins/dali-swig/SWIG/signals.i
plugins/dali-swig/SWIG/tableView.i [deleted file]
plugins/dali-swig/SWIG/textLabel.i [deleted file]
plugins/dali-swig/examples/dali-test.cs
plugins/dali-swig/examples/hello-world.cs
plugins/dali-swig/examples/scroll-view.cs
plugins/dali-swig/manual/csharp/Color.cs
plugins/dali-swig/manual/csharp/Position.cs
plugins/dali-swig/manual/csharp/Size.cs

index 1cd8ad6..6bd2c05 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1433,3 +1433,26 @@ int UtcDaliPopupOnKeyEvent(void)
 
   END_TEST;
 }
+
+int UtcDaliPopupSetPopupBackgroundBorderProperty(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline( "Set the background border property of a popup & retrieve it" );
+  Popup popup = Popup::New();
+
+  Rect< int > rect( 40, 30, 20, 10 );
+  tet_infoline( "Ensure value we want to set is different from what is already set" );
+  DALI_TEST_CHECK( rect != popup.GetProperty( Popup::Property::POPUP_BACKGROUND_BORDER ).Get< Rect< int > >() );
+
+  tet_infoline( "Set the property and retrieve it to make sure it's the value we set" );
+  popup.SetProperty( Popup::Property::POPUP_BACKGROUND_BORDER, rect );
+  DALI_TEST_EQUALS( rect, popup.GetProperty( Popup::Property::POPUP_BACKGROUND_BORDER ).Get< Rect< int > >(), TEST_LOCATION );
+
+  tet_infoline( "Set a vector4 as well which should also work" );
+  Vector4 vectorValue( 10.0f, 20.0f, 30.0f, 40.0f );
+  popup.SetProperty( Popup::Property::POPUP_BACKGROUND_BORDER, vectorValue );
+  DALI_TEST_EQUALS( Rect< int >( 10, 20, 30, 40 ), popup.GetProperty( Popup::Property::POPUP_BACKGROUND_BORDER ).Get< Rect< int > >(), TEST_LOCATION );
+
+  END_TEST;
+}
index 6251c01..3d3d915 100644 (file)
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_POPUP_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -89,6 +89,7 @@ public:
       BACKING_ENABLED,              ///< name "backingEnabled",         type bool
       BACKING_COLOR,                ///< name "backingColor",           type Vector4
       POPUP_BACKGROUND_IMAGE,       ///< name "popupBackgroundImage",   type std::string
+      POPUP_BACKGROUND_BORDER,      ///< name "popupBackgroundBorder",  type Rect< int >,      Values are in the order: left, right, bottom, top
       TAIL_UP_IMAGE,                ///< name "tailUpImage",            type std::string
       TAIL_DOWN_IMAGE,              ///< name "tailDownImage",          type std::string
       TAIL_LEFT_IMAGE,              ///< name "tailLeftImage",          type std::string
index 7ac2a28..e59dc0c 100755 (executable)
@@ -107,39 +107,40 @@ BaseHandle CreateToast()
 DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Popup, Toolkit::Control, Create )
 
 // Main content related properties.
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "title",                             MAP,              TITLE                  )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "content",                           MAP,              CONTENT                )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "footer",                            MAP,              FOOTER                 )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "displayState",                      STRING,           DISPLAY_STATE          )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "touchTransparent",                  BOOLEAN,          TOUCH_TRANSPARENT      )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "title",                             MAP,              TITLE                   )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "content",                           MAP,              CONTENT                 )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "footer",                            MAP,              FOOTER                  )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "displayState",                      STRING,           DISPLAY_STATE           )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "touchTransparent",                  BOOLEAN,          TOUCH_TRANSPARENT       )
 
 // Contextual related properties.
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "tailVisibility",                    BOOLEAN,          TAIL_VISIBILITY        )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "tailPosition",                      VECTOR3,          TAIL_POSITION          )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "contextualMode",                    STRING,           CONTEXTUAL_MODE        )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "tailVisibility",                    BOOLEAN,          TAIL_VISIBILITY         )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "tailPosition",                      VECTOR3,          TAIL_POSITION           )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "contextualMode",                    STRING,           CONTEXTUAL_MODE         )
 
 // Animation related properties.
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "animationDuration",                 FLOAT,            ANIMATION_DURATION     )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "animationMode",                     STRING,           ANIMATION_MODE         )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "entryAnimation",                    MAP,              ENTRY_ANIMATION        )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "exitAnimation",                     MAP,              EXIT_ANIMATION         )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "autoHideDelay",                     INTEGER,          AUTO_HIDE_DELAY        )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "animationDuration",                 FLOAT,            ANIMATION_DURATION      )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "animationMode",                     STRING,           ANIMATION_MODE          )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "entryAnimation",                    MAP,              ENTRY_ANIMATION         )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "exitAnimation",                     MAP,              EXIT_ANIMATION          )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "autoHideDelay",                     INTEGER,          AUTO_HIDE_DELAY         )
 
 // Style related properties.
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "backingEnabled",                    BOOLEAN,          BACKING_ENABLED        )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "backingColor",                      VECTOR4,          BACKING_COLOR          )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "popupBackgroundImage",              STRING,           POPUP_BACKGROUND_IMAGE )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "tailUpImage",                       STRING,           TAIL_UP_IMAGE          )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "tailDownImage",                     STRING,           TAIL_DOWN_IMAGE        )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "tailLeftImage",                     STRING,           TAIL_LEFT_IMAGE        )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "tailRightImage",                    STRING,           TAIL_RIGHT_IMAGE       )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "backingEnabled",                    BOOLEAN,          BACKING_ENABLED         )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "backingColor",                      VECTOR4,          BACKING_COLOR           )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "popupBackgroundImage",              STRING,           POPUP_BACKGROUND_IMAGE  )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "popupBackgroundBorder",             RECTANGLE,        POPUP_BACKGROUND_BORDER )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "tailUpImage",                       STRING,           TAIL_UP_IMAGE           )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "tailDownImage",                     STRING,           TAIL_DOWN_IMAGE         )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "tailLeftImage",                     STRING,           TAIL_LEFT_IMAGE         )
+DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "tailRightImage",                    STRING,           TAIL_RIGHT_IMAGE        )
 
 // Signals.
-DALI_SIGNAL_REGISTRATION(   Toolkit, Popup, "touchedOutside",                                      SIGNAL_TOUCHED_OUTSIDE )
-DALI_SIGNAL_REGISTRATION(   Toolkit, Popup, "showing",                                             SIGNAL_SHOWING         )
-DALI_SIGNAL_REGISTRATION(   Toolkit, Popup, "shown",                                               SIGNAL_SHOWN           )
-DALI_SIGNAL_REGISTRATION(   Toolkit, Popup, "hiding",                                              SIGNAL_HIDING          )
-DALI_SIGNAL_REGISTRATION(   Toolkit, Popup, "hidden",                                              SIGNAL_HIDDEN          )
+DALI_SIGNAL_REGISTRATION(   Toolkit, Popup, "touchedOutside",                                      SIGNAL_TOUCHED_OUTSIDE  )
+DALI_SIGNAL_REGISTRATION(   Toolkit, Popup, "showing",                                             SIGNAL_SHOWING          )
+DALI_SIGNAL_REGISTRATION(   Toolkit, Popup, "shown",                                               SIGNAL_SHOWN            )
+DALI_SIGNAL_REGISTRATION(   Toolkit, Popup, "hiding",                                              SIGNAL_HIDING           )
+DALI_SIGNAL_REGISTRATION(   Toolkit, Popup, "hidden",                                              SIGNAL_HIDDEN           )
 
 DALI_TYPE_REGISTRATION_END()
 
@@ -191,7 +192,7 @@ const char*   DEFAULT_TAIL_LEFT_IMAGE_PATH =      DALI_IMAGE_DIR "popup_tail_lef
 const char*   DEFAULT_TAIL_RIGHT_IMAGE_PATH =     DALI_IMAGE_DIR "popup_tail_right.png";    ///< Tail right image.
 
 const Vector4 DEFAULT_BACKING_COLOR( 0.0f, 0.0f, 0.0f, 0.5f );                              ///< Color of the dimmed backing.
-const Vector3 BACKGROUND_OUTER_BORDER( 40.0f, 30.0f, 0.0f );                                ///< External border.
+const Rect<int> DEFAULT_BACKGROUND_BORDER( 17, 17, 13, 13 );                                ///< Default border of the background.
 const Rect<float>  DEFAULT_TITLE_PADDING( 20.0f, 20.0f, 20.0f, 20.0f );                     ///< Title padding used on popups with content and/or controls (from Tizen GUI UX).
 const Rect<float>  DEFAULT_TITLE_ONLY_PADDING( 8.0f, 8.0f, 8.0f, 8.0f );                    ///< Title padding used on popups with a title only (like toast popups).
 const Vector3 FOOTER_SIZE( 620.0f, 96.0f,0.0f );                                            ///< Default size of the bottom control area.
@@ -251,7 +252,7 @@ Popup::Popup()
   mBackingEnabled( true ),
   mBackingColor( DEFAULT_BACKING_COLOR ),
   mPopupBackgroundImage(),
-  mBackgroundOuterBorder(),
+  mBackgroundBorder( DEFAULT_BACKGROUND_BORDER ),
   mMargin(),
   mTailUpImage( DEFAULT_TAIL_UP_IMAGE_PATH ),
   mTailDownImage( DEFAULT_TAIL_DOWN_IMAGE_PATH ),
@@ -567,7 +568,11 @@ void Popup::SetPopupBackgroundImage( Actor image )
   // Removes any previous background.
   if( mPopupBackgroundImage )
   {
-    mPopupContainer.Remove( mPopupBackgroundImage );
+    mPopupBackgroundImage.Unparent();
+    if( mTailImage )
+    {
+      mTailImage.Unparent();
+    }
   }
 
   // Adds new background to the dialog.
@@ -580,14 +585,18 @@ void Popup::SetPopupBackgroundImage( Actor image )
   mPopupBackgroundImage.TouchSignal().Connect( this, &Popup::OnDialogTouched );
 
   // Set the popup border to be slightly larger than the layout contents.
-  mPopupBackgroundImage.SetResizePolicy( ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT, Dimension::ALL_DIMENSIONS );
-  mPopupBackgroundImage.SetSizeModeFactor( BACKGROUND_OUTER_BORDER );
+  UpdateBackgroundPositionAndSize();
 
   const bool prevAlter = mAlterAddedChild;
   mAlterAddedChild = false;
   mPopupContainer.Add( mPopupBackgroundImage );
   mAlterAddedChild = prevAlter;
 
+  if( mTailImage )
+  {
+    mPopupBackgroundImage.Add( mTailImage );
+  }
+
   mLayoutDirty = true;
 }
 
@@ -838,25 +847,35 @@ void Popup::LayoutTail()
     return;
   }
 
-  const Vector3& position = GetTailPosition();
+  const Vector3& parentOrigin = GetTailPosition();
+  Vector3 position;
   std::string image;
+  Vector3 anchorPoint;
 
   // depending on position of tail around ParentOrigin, a different tail image is used...
-  if( position.y < Math::MACHINE_EPSILON_1 )
+  if( parentOrigin.y < Math::MACHINE_EPSILON_1 )
   {
     image = mTailUpImage;
+    anchorPoint = AnchorPoint::BOTTOM_CENTER;
+    position.y = mBackgroundBorder.top;
   }
-  else if( position.y > 1.0f - Math::MACHINE_EPSILON_1 )
+  else if( parentOrigin.y > ( 1.0f - Math::MACHINE_EPSILON_1 ) )
   {
     image = mTailDownImage;
+    anchorPoint = AnchorPoint::TOP_CENTER;
+    position.y = - mBackgroundBorder.bottom;
   }
-  else if( position.x < Math::MACHINE_EPSILON_1 )
+  else if( parentOrigin.x < Math::MACHINE_EPSILON_1 )
   {
     image = mTailLeftImage;
+    anchorPoint = AnchorPoint::CENTER_RIGHT;
+    position.x = mBackgroundBorder.left;
   }
-  else if( position.x > 1.0f - Math::MACHINE_EPSILON_1 )
+  else if( parentOrigin.x > ( 1.0f - Math::MACHINE_EPSILON_1 ) )
   {
     image = mTailRightImage;
+    anchorPoint = AnchorPoint::CENTER_LEFT;
+    position.x = - mBackgroundBorder.right;
   }
 
   if( !image.empty() )
@@ -864,11 +883,14 @@ void Popup::LayoutTail()
     // Adds the tail actor.
     mTailImage = Toolkit::ImageView::New( image );
     mTailImage.SetName( "tailImage" );
-    const Vector3 anchorPoint = AnchorPoint::BOTTOM_RIGHT - position;
-    mTailImage.SetParentOrigin( position );
+    mTailImage.SetParentOrigin( parentOrigin );
     mTailImage.SetAnchorPoint( anchorPoint );
+    mTailImage.SetPosition( position );
 
-    mPopupContainer.Add( mTailImage );
+    if( mPopupBackgroundImage )
+    {
+      mPopupBackgroundImage.Add( mTailImage );
+    }
   }
 }
 
@@ -988,6 +1010,18 @@ void Popup::SetExitAnimationData( const Property::Map& map )
   Scripting::NewAnimation( map, mExitAnimationData );
 }
 
+void Popup::UpdateBackgroundPositionAndSize()
+{
+  if( mPopupBackgroundImage )
+  {
+    mPopupBackgroundImage.SetResizePolicy( ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT, Dimension::ALL_DIMENSIONS );
+    mPopupBackgroundImage.SetSizeModeFactor( Vector3( mBackgroundBorder.left + mBackgroundBorder.right, mBackgroundBorder.top + mBackgroundBorder.bottom, 0.0f ) );
+
+    // Adjust the position of the background so the transparent areas are set appropriately
+    mPopupBackgroundImage.SetPosition( ( mBackgroundBorder.right - mBackgroundBorder.left ) * 0.5f, ( mBackgroundBorder.bottom - mBackgroundBorder.top ) * 0.5f );
+  }
+}
+
 void Popup::SetAutoHideDelay( int delay )
 {
   mAutoHideDelay = delay;
@@ -1025,6 +1059,7 @@ void Popup::SetTailUpImage( std::string image )
 {
   mTailUpImage = image;
   mLayoutDirty = true;
+  LayoutTail();
 }
 
 const std::string& Popup::GetTailUpImage() const
@@ -1036,6 +1071,7 @@ void Popup::SetTailDownImage( std::string image )
 {
   mTailDownImage = image;
   mLayoutDirty = true;
+  LayoutTail();
 }
 
 const std::string& Popup::GetTailDownImage() const
@@ -1047,6 +1083,7 @@ void Popup::SetTailLeftImage( std::string image )
 {
   mTailLeftImage = image;
   mLayoutDirty = true;
+  LayoutTail();
 }
 
 const std::string& Popup::GetTailLeftImage() const
@@ -1058,6 +1095,7 @@ void Popup::SetTailRightImage( std::string image )
 {
   mTailRightImage = image;
   mLayoutDirty = true;
+  LayoutTail();
 }
 
 const std::string& Popup::GetTailRightImage() const
@@ -1242,6 +1280,31 @@ void Popup::SetProperty( BaseObject* object, Property::Index propertyIndex, cons
         }
         break;
       }
+      case Toolkit::Popup::Property::POPUP_BACKGROUND_BORDER:
+      {
+        bool valueUpdated = false;
+
+        Vector4 valueVector4;
+        if( value.Get( popupImpl.mBackgroundBorder ) )
+        {
+          valueUpdated = true;
+        }
+        else if( value.Get( valueVector4 ) )
+        {
+          popupImpl.mBackgroundBorder.left   = valueVector4.x;
+          popupImpl.mBackgroundBorder.right  = valueVector4.y;
+          popupImpl.mBackgroundBorder.bottom = valueVector4.z;
+          popupImpl.mBackgroundBorder.top    = valueVector4.w;
+          valueUpdated = true;
+        }
+
+        if( valueUpdated )
+        {
+          popupImpl.LayoutTail(); // Update the tail if required
+          popupImpl.UpdateBackgroundPositionAndSize(); // Update the background's size and position
+        }
+        break;
+      }
       case Toolkit::Popup::Property::TAIL_UP_IMAGE:
       {
         std::string valueString;
@@ -1388,6 +1451,11 @@ Property::Value Popup::GetProperty( BaseObject* object, Property::Index property
         }
         break;
       }
+      case Toolkit::Popup::Property::POPUP_BACKGROUND_BORDER:
+      {
+        value = popupImpl.mBackgroundBorder;
+        break;
+      }
       case Toolkit::Popup::Property::TAIL_UP_IMAGE:
       {
         value = popupImpl.GetTailUpImage();
index cc5a2f6..1596a92 100755 (executable)
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_INTERNAL_POPUP_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -347,6 +347,11 @@ private:
    */
   void SetExitAnimationData( const Property::Map& map );
 
+  /**
+   * @briefs Updates the popup background's position and size.
+   */
+  void UpdateBackgroundPositionAndSize();
+
 public: // Signals
 
   /**
@@ -542,7 +547,7 @@ private:
   bool mBackingEnabled;                              ///< True if a dimmed backing will be used.
   Vector4 mBackingColor;                             ///< The color of the backing.
   Actor mPopupBackgroundImage;                       ///< Stores the background image.
-  Vector4 mBackgroundOuterBorder;                    ///< Background external border margin size
+  Rect<int> mBackgroundBorder;                       ///< Background border.
   float mMargin;                                     ///< Internal margin for popup contents.
   std::string mTailUpImage;                          ///< Image used for the tail for the up direction.
   std::string mTailDownImage;                        ///< Image used for the tail for the down direction.
index 264c19b..4ec9d10 100644 (file)
     },
     "Popup":
     {
-      "popupBackgroundImage":"{DALI_IMAGE_DIR}00_popup_bg.9.png"
+      "popupBackgroundImage":"{DALI_IMAGE_DIR}00_popup_bg.9.png",
+      "tailUpImage":"{DALI_IMAGE_DIR}popup_tail_up.png",
+      "tailDownImage":"{DALI_IMAGE_DIR}popup_tail_down.png",
+      "tailLeftImage":"{DALI_IMAGE_DIR}popup_tail_left.png",
+      "tailRightImage":"{DALI_IMAGE_DIR}popup_tail_right.png",
+      "popupBackgroundBorder":[17,17,13,13]
     },
     "ConfirmationPopup":
     {
-      "popupBackgroundImage":"{DALI_IMAGE_DIR}00_popup_bg.9.png"
+      "popupBackgroundImage":"{DALI_IMAGE_DIR}00_popup_bg.9.png",
+      "tailUpImage":"{DALI_IMAGE_DIR}popup_tail_up.png",
+      "tailDownImage":"{DALI_IMAGE_DIR}popup_tail_down.png",
+      "tailLeftImage":"{DALI_IMAGE_DIR}popup_tail_left.png",
+      "tailRightImage":"{DALI_IMAGE_DIR}popup_tail_right.png",
+      "popupBackgroundBorder":[17,17,13,13]
     },
     "Slider":
     {
index 923680d..bc8931d 100644 (file)
     },
     "Popup":
     {
-      "popupBackgroundImage":"{DALI_IMAGE_DIR}00_popup_bg.9.png"
+      "popupBackgroundImage":"{DALI_IMAGE_DIR}00_popup_bg.9.png",
+      "tailUpImage":"{DALI_IMAGE_DIR}popup_tail_up.png",
+      "tailDownImage":"{DALI_IMAGE_DIR}popup_tail_down.png",
+      "tailLeftImage":"{DALI_IMAGE_DIR}popup_tail_left.png",
+      "tailRightImage":"{DALI_IMAGE_DIR}popup_tail_right.png",
+      "popupBackgroundBorder":[17,17,13,13]
     },
     "ConfirmationPopup":
     {
-      "popupBackgroundImage":"{DALI_IMAGE_DIR}00_popup_bg.9.png"
+      "popupBackgroundImage":"{DALI_IMAGE_DIR}00_popup_bg.9.png",
+      "tailUpImage":"{DALI_IMAGE_DIR}popup_tail_up.png",
+      "tailDownImage":"{DALI_IMAGE_DIR}popup_tail_down.png",
+      "tailLeftImage":"{DALI_IMAGE_DIR}popup_tail_left.png",
+      "tailRightImage":"{DALI_IMAGE_DIR}popup_tail_right.png",
+      "popupBackgroundBorder":[17,17,13,13]
     },
     "Slider":
     {
index b8f5b3f..825dd98 100644 (file)
Binary files a/dali-toolkit/styles/images-common/00_popup_bg.9.png and b/dali-toolkit/styles/images-common/00_popup_bg.9.png differ
index 0e66bee..6b6966a 100644 (file)
@@ -66,6 +66,7 @@ $(BUILT_SOURCES): SWIG/*.i
        rm -f automatic/csharp/*.cs
        $(SWIG) -csharp -c++ -outdir automatic/csharp \
             $(DALI_CFLAGS) $(DALICORE_CFLAGS) $(DALIADAPTOR_CFLAGS) $(DALITOOLKIT_CFLAGS) -namespace Dali -o automatic/cpp/dali_wrap.cpp SWIG/dali.i
+       ./property-wrapper.rb
        ./constructor-generator.rb
 
 dist-hook: $(BUILT_SOURCES)
index 6cc67c4..cfed355 100644 (file)
@@ -1,3 +1,25 @@
+To add the Mono Project GPG signing key and the package repository (http://www.mono-project.com/docs/getting-started/install/linux/):
+
+sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
+sudo apt-get update
+
+To install Mono:
+
+sudo apt-get install mono-devel
+sudo apt-get install mono-complete
+sudo apt-get install referenceassemblies-pcl
+sudo apt-get install ca-certificates-mono
+
+To install SWIG:
+
+a) Download Swig-3.0.10 from http://www.swig.org/download.html
+b) Untar the files and refer "INSTALL" file to install Swig as mentioned below:
+  1) ./configure --with-csharp-compiler=/usr/bin/mcs 
+     (/usr/bin/mcs  is the mono compiler path from step 1)
+  2) make
+  3) sudo make install
+
 To build C# binding for Ubuntu desktop using SWIG for the first time:
 
 ./autogen.sh
diff --git a/plugins/dali-swig/SWIG/cameraActor.i b/plugins/dali-swig/SWIG/cameraActor.i
deleted file mode 100644 (file)
index 7934095..0000000
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-%define CAMERAACTOR_PROPERTIES_HELPER(NameSpace, ClassName)
-%typemap(cscode) NameSpace::ClassName %{
-
-/* Properties earlier added by Ruby Script */
-
-  public string Type
-  {
-    get
-    {
-      string temp;
-      GetProperty( CameraActor.Property.TYPE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.TYPE, new Dali.Property.Value( value ) );
-    }
-  }
-  public string ProjectionMode
-  {
-    get
-    {
-      string temp;
-      GetProperty( CameraActor.Property.PROJECTION_MODE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.PROJECTION_MODE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float FieldOfView
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( CameraActor.Property.FIELD_OF_VIEW).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.FIELD_OF_VIEW, new Dali.Property.Value( value ) );
-    }
-  }
-  public float AspectRatio
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( CameraActor.Property.ASPECT_RATIO).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.ASPECT_RATIO, new Dali.Property.Value( value ) );
-    }
-  }
-  public float NearPlaneDistance
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( CameraActor.Property.NEAR_PLANE_DISTANCE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.NEAR_PLANE_DISTANCE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float FarPlaneDistance
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( CameraActor.Property.FAR_PLANE_DISTANCE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.FAR_PLANE_DISTANCE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float LeftPlaneDistance
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( CameraActor.Property.LEFT_PLANE_DISTANCE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.LEFT_PLANE_DISTANCE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float RightPlaneDistance
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( CameraActor.Property.RIGHT_PLANE_DISTANCE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.RIGHT_PLANE_DISTANCE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float TopPlaneDistance
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( CameraActor.Property.TOP_PLANE_DISTANCE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.TOP_PLANE_DISTANCE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float BottomPlaneDistance
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( CameraActor.Property.BOTTOM_PLANE_DISTANCE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.BOTTOM_PLANE_DISTANCE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Position TargetPosition
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( CameraActor.Property.TARGET_POSITION).Get(  temp );
-      Dali.CSharp.Position ret = new Dali.CSharp.Position(temp.x, temp.y, temp.z);
-      return ret;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.TARGET_POSITION, new Dali.Property.Value( value ) );
-    }
-  }
-  public Matrix ProjectionMatrix
-  {
-    get
-    {
-      Matrix temp = new Matrix();
-      GetProperty( CameraActor.Property.PROJECTION_MATRIX).Get(  temp );
-      return temp;
-    }
-  }
-  public Matrix ViewMatrix
-  {
-    get
-    {
-      Matrix temp = new Matrix();
-      GetProperty( CameraActor.Property.VIEW_MATRIX).Get(  temp );
-      return temp;
-    }
-  }
-  public bool InvertYAxis
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( CameraActor.Property.INVERT_Y_AXIS).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.INVERT_Y_AXIS, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
-/* Constructor and APIs with high level class Size */
-
-  public CameraActor (Dali.CSharp.Size size) : this (NDalicPINVOKE.CameraActor_New__SWIG_1(Vector2.getCPtr(new Vector2(size.W,size.H))), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetPerspectiveProjection(Dali.CSharp.Size size) {
-    NDalicPINVOKE.CameraActor_SetPerspectiveProjection(swigCPtr, Vector2.getCPtr(new Vector2(size.W,size.H)));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetOrthographicProjection(Dali.CSharp.Size size) {
-    NDalicPINVOKE.CameraActor_SetOrthographicProjection__SWIG_0(swigCPtr, Vector2.getCPtr(new Vector2(size.W,size.H)));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-/* constructor and APIs end */
-
-
-%}
-%enddef
-
-namespace Dali
-{
-  CAMERAACTOR_PROPERTIES_HELPER( Dali, CameraActor);
-
-}
index 20eb449..3a1cd6d 100644 (file)
@@ -296,18 +296,3 @@ typedef std::pair< Dali::Radian, Dali::Radian > AngleThresholdPair;
 %template(TapGestureDetectedSignal) Dali::Signal<void (Dali::Actor, const Dali::TapGesture&)>;
 %template(AnimationSignal) Dali::Signal<void(Dali::Animation&)>;
 %template(ResourceImageSignal) Dali::Signal<void(Dali::ResourceImage)>;
-
-%define QUATERNION_TYPEMAP_HELPER(NameSpace, ClassName)
-%typemap(cscode) NameSpace::ClassName %{
-  public Quaternion(Radian angle, Dali.CSharp.Position pos) : this(angle, new Vector3(pos.X, pos.Y, pos.Z) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-%}
-%enddef
-
-namespace Dali
-{
-  QUATERNION_TYPEMAP_HELPER( Dali, Quaternion);
-}
-
index c9f585d..56693b8 100644 (file)
@@ -97,6 +97,7 @@
 %rename(View) Dali::Toolkit::Control;
 %rename(ViewImpl) Dali::Toolkit::Internal::Control;
 %rename(VisualBase) Dali::Toolkit::Visual::Base;
+%rename(LoadImageSynchronously) Dali::Toolkit::SyncImageLoader::Load;
 %rename(ControlOrientationType) Dali::Toolkit::ControlOrientation::Type;
 %rename(DefaultItemLayoutType) Dali::Toolkit::DefaultItemLayout::Type;
 %rename(NewItemLayout) Dali::Toolkit::DefaultItemLayout::New;
@@ -185,7 +186,7 @@ typedef Dali::IntrusivePtr<Dali::Toolkit::Ruler> RulerPtr;
 %include <dali-toolkit/public-api/visuals/image-visual-properties.h>
 %include <dali-toolkit/public-api/visuals/mesh-visual-properties.h>
 %include <dali-toolkit/public-api/visuals/primitive-visual-properties.h>
-%include <dali-toolkit/public-api/visuals/text-visual-properties.h>
+%include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
 
 %include <dali-toolkit/devel-api/builder/builder.h>
 
@@ -237,6 +238,10 @@ typedef Dali::IntrusivePtr<Dali::Toolkit::Ruler> RulerPtr;
 %include <dali-toolkit/devel-api/visual-factory/visual-base.h>
 %include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 
+%include <dali-toolkit/public-api/image-loader/async-image-loader.h>
+%include <dali-toolkit/public-api/image-loader/sync-image-loader.h>
+%include <dali-toolkit/public-api/text/rendering-backend.h>
+
 %template(ItemIdContainer) std::vector<unsigned int>;
 %template(Item) std::pair<unsigned int, Dali::Actor>;
 %template(ItemContainer) std::vector<std::pair<unsigned int, Dali::Actor>>;
index 79e987b..4a612e9 100755 (executable)
@@ -78,6 +78,8 @@
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visual-factory/transition-data.h>
 
+#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
+
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h>
 
 // add here SWIG version check
 
 #endif
 
-
 %ignore operator<<;
 %ignore *::GetImplementation();
 %ignore *::GetImplementation(Dali::BaseHandle&);
@@ -216,27 +217,8 @@ using namespace Dali::Toolkit;
 %include events/textfield-event.i
 %include events/timer-event.i
 %include events/videoview-event.i
-%include events/rendertask-event.i
 
 %include alphafunction.i
-%include cameraActor.i
-%include flexContainer.i
-%include imageView.i
-%include layer.i
-%include linearConstrainer.i
-%include model3DView.i
-%include path.i
-%include pathConstrainer.i
-%include progressBar.i
-%include pushButton.i
-%include renderer.i
-%include shader.i
-%include tableView.i
-%include textLabel.i
-
-%include propertyValue.i
-%include pageTurnLandscapeView.i
-%include pageTurnPortraitView.i
 
 %include dali-operator.i
 %include dali-core.i
index 3e47016..1deccbc 100644 (file)
       SetVisible(false);
     }
 
-/* Properties earlier added by Ruby Script */
-
-  public Dali.CSharp.Position ParentOrigin
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.PARENT_ORIGIN).Get(  temp );
-      Dali.CSharp.Position ret = new Dali.CSharp.Position(temp.x, temp.y, temp.z);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Actor.Property.PARENT_ORIGIN, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ParentOriginX
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.PARENT_ORIGIN_X).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.PARENT_ORIGIN_X, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ParentOriginY
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.PARENT_ORIGIN_Y).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.PARENT_ORIGIN_Y, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ParentOriginZ
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.PARENT_ORIGIN_Z).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.PARENT_ORIGIN_Z, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Position AnchorPoint
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.ANCHOR_POINT).Get(  temp );
-      Dali.CSharp.Position ret = new Dali.CSharp.Position(temp.x, temp.y, temp.z);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Actor.Property.ANCHOR_POINT, new Dali.Property.Value( value ) );
-    }
-  }
-  public float AnchorPointX
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.ANCHOR_POINT_X).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.ANCHOR_POINT_X, new Dali.Property.Value( value ) );
-    }
-  }
-  public float AnchorPointY
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.ANCHOR_POINT_Y).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.ANCHOR_POINT_Y, new Dali.Property.Value( value ) );
-    }
-  }
-  public float AnchorPointZ
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.ANCHOR_POINT_Z).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.ANCHOR_POINT_Z, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Position Size
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.SIZE).Get(  temp );
-      Dali.CSharp.Position ret = new Dali.CSharp.Position(temp.x, temp.y, temp.z);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SIZE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float SizeWidth
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.SIZE_WIDTH).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SIZE_WIDTH, new Dali.Property.Value( value ) );
-    }
-  }
-  public float SizeHeight
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.SIZE_HEIGHT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SIZE_HEIGHT, new Dali.Property.Value( value ) );
-    }
-  }
-  public float SizeDepth
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.SIZE_DEPTH).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SIZE_DEPTH, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Position Position
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.POSITION).Get(  temp );
-      Dali.CSharp.Position ret = new Dali.CSharp.Position(temp.x, temp.y, temp.z);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Actor.Property.POSITION, new Dali.Property.Value( value ) );
-    }
-  }
-  public float PositionX
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.POSITION_X).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.POSITION_X, new Dali.Property.Value( value ) );
-    }
-  }
-  public float PositionY
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.POSITION_Y).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.POSITION_Y, new Dali.Property.Value( value ) );
-    }
-  }
-  public float PositionZ
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.POSITION_Z).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.POSITION_Z, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Position WorldPosition
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.WORLD_POSITION).Get(  temp );
-      Dali.CSharp.Position ret = new Dali.CSharp.Position(temp.x, temp.y, temp.z);
-      return ret;
-    }
-}  public float WorldPositionX
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.WORLD_POSITION_X).Get( ref temp );
-      return temp;
-    }
-}  public float WorldPositionY
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.WORLD_POSITION_Y).Get( ref temp );
-      return temp;
-    }
-}  public float WorldPositionZ
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.WORLD_POSITION_Z).Get( ref temp );
-      return temp;
-    }
-}  public Quaternion Orientation
-  {
-    get
-    {
-      Quaternion temp = new Quaternion();
-      GetProperty( Actor.Property.ORIENTATION).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.ORIENTATION, new Dali.Property.Value( value ) );
-    }
-  }
-  public Quaternion WorldOrientation
-  {
-    get
-    {
-      Quaternion temp = new Quaternion();
-      GetProperty( Actor.Property.WORLD_ORIENTATION).Get(  temp );
-      return temp;
-    }
-}  public Dali.CSharp.Position Scale
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.SCALE).Get(  temp );
-      Dali.CSharp.Position ret = new Dali.CSharp.Position(temp.x, temp.y, temp.z);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SCALE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ScaleX
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.SCALE_X).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SCALE_X, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ScaleY
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.SCALE_Y).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SCALE_Y, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ScaleZ
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.SCALE_Z).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SCALE_Z, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Position WorldScale
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.WORLD_SCALE).Get(  temp );
-      Dali.CSharp.Position ret = new Dali.CSharp.Position(temp.x, temp.y, temp.z);
-      return ret;
-    }
-}  public bool Visible
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Actor.Property.VISIBLE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.VISIBLE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color Color
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.x, temp.y, temp.z, temp.w);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Actor.Property.COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ColorRed
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.COLOR_RED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.COLOR_RED, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ColorGreen
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.COLOR_GREEN).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.COLOR_GREEN, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ColorBlue
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.COLOR_BLUE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.COLOR_BLUE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ColorAlpha
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.COLOR_ALPHA).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.COLOR_ALPHA, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color WorldColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.WORLD_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-}  public Matrix WorldMatrix
-  {
-    get
-    {
-      Matrix temp = new Matrix();
-      GetProperty( Actor.Property.WORLD_MATRIX).Get(  temp );
-      return temp;
-    }
-}  public string Name
-  {
-    get
-    {
-      string temp;
-      GetProperty( Actor.Property.NAME).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.NAME, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool Sensitive
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Actor.Property.SENSITIVE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SENSITIVE, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool LeaveRequired
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Actor.Property.LEAVE_REQUIRED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.LEAVE_REQUIRED, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool InheritOrientation
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Actor.Property.INHERIT_ORIENTATION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.INHERIT_ORIENTATION, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool InheritScale
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Actor.Property.INHERIT_SCALE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.INHERIT_SCALE, new Dali.Property.Value( value ) );
-    }
-  }
-  public string ColorMode
-  {
-    get
-    {
-      string temp;
-      GetProperty( Actor.Property.COLOR_MODE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.COLOR_MODE, new Dali.Property.Value( value ) );
-    }
-  }
-  public string PositionInheritance
-  {
-    get
-    {
-      string temp;
-      GetProperty( Actor.Property.POSITION_INHERITANCE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.POSITION_INHERITANCE, new Dali.Property.Value( value ) );
-    }
-  }
-  public string DrawMode
-  {
-    get
-    {
-      string temp;
-      GetProperty( Actor.Property.DRAW_MODE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.DRAW_MODE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Position SizeModeFactor
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.SIZE_MODE_FACTOR).Get(  temp );
-      Dali.CSharp.Position ret = new Dali.CSharp.Position(temp.x, temp.y, temp.z);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SIZE_MODE_FACTOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public string WidthResizePolicy
-  {
-    get
-    {
-      string temp;
-      GetProperty( Actor.Property.WIDTH_RESIZE_POLICY).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.WIDTH_RESIZE_POLICY, new Dali.Property.Value( value ) );
-    }
-  }
-  public string HeightResizePolicy
-  {
-    get
-    {
-      string temp;
-      GetProperty( Actor.Property.HEIGHT_RESIZE_POLICY).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.HEIGHT_RESIZE_POLICY, new Dali.Property.Value( value ) );
-    }
-  }
-  public string SizeScalePolicy
-  {
-    get
-    {
-      string temp;
-      GetProperty( Actor.Property.SIZE_SCALE_POLICY).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SIZE_SCALE_POLICY, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool WidthForHeight
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Actor.Property.WIDTH_FOR_HEIGHT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.WIDTH_FOR_HEIGHT, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool HeightForWidth
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Actor.Property.HEIGHT_FOR_WIDTH).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.HEIGHT_FOR_WIDTH, new Dali.Property.Value( value ) );
-    }
-  }
-  public Vector4 Padding
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.PADDING).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.PADDING, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size MinimumSize
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( Actor.Property.MINIMUM_SIZE).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Actor.Property.MINIMUM_SIZE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size MaximumSize
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( Actor.Property.MAXIMUM_SIZE).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Actor.Property.MAXIMUM_SIZE, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool InheritPosition
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Actor.Property.INHERIT_POSITION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.INHERIT_POSITION, new Dali.Property.Value( value ) );
-    }
-  }
-  public string ClippingMode
-  {
-    get
-    {
-      string temp;
-      GetProperty( Actor.Property.CLIPPING_MODE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.CLIPPING_MODE, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool BatchParent
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Actor.Property.BATCH_PARENT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.BATCH_PARENT, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
 %}
 
 %enddef
@@ -794,27 +102,7 @@ ACTOR_EVENTHANDLER_TYPEMAP_HELPER( NameSpace, ClassName);
 
 %enddef
 
-%define DALI_CONST_VECTOR4_REF_TO_COLOR_CONVERSION
-%typemap(cstype) (const Vector4& color) "Dali.CSharp.Color"
-%typemap(csin,
-         pre=" Vector4 temp$csinput = new Vector4($csinput.R, $csinput.G, $csinput.B, $csinput.A);",
-         cshin="ref $csinput"
-        ) (const Vector4& color) "$csclassname.getCPtr(temp$csinput)"
-
-%enddef
-
-%define DALI_VECTOR2_TO_SIZE_CONVERSION
-%typemap(cstype) (const Vector2& position) "Dali.CSharp.Size"
-%typemap(csin,
-         pre=" Vector2 temp$csinput = new Vector2($csinput.W, $csinput.H);",
-         cshin="ref $csinput"
-        ) (const Vector2& position) "$csclassname.getCPtr(temp$csinput)"
-
-%enddef
-
 namespace Dali
 {
   DALI_ACTOR_EVENTHANDLER_PARAM( Dali, Actor);
-  DALI_CONST_VECTOR4_REF_TO_COLOR_CONVERSION;
-  DALI_VECTOR2_TO_SIZE_CONVERSION;
 }
index f7e8f3f..bfef5ad 100644 (file)
@@ -312,183 +312,6 @@ public class StateChangedEventArgs : EventArgs
     return ret;
   }
 
-
-/* Properties earlier added by Ruby Script */
-
-  public bool Disabled
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Button.Property.DISABLED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.DISABLED, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool AutoRepeating
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Button.Property.AUTO_REPEATING).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.AUTO_REPEATING, new Dali.Property.Value( value ) );
-    }
-  }
-  public float InitialAutoRepeatingDelay
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Button.Property.INITIAL_AUTO_REPEATING_DELAY).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.INITIAL_AUTO_REPEATING_DELAY, new Dali.Property.Value( value ) );
-    }
-  }
-  public float NextAutoRepeatingDelay
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Button.Property.NEXT_AUTO_REPEATING_DELAY).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.NEXT_AUTO_REPEATING_DELAY, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool Togglable
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Button.Property.TOGGLABLE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.TOGGLABLE, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool Selected
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Button.Property.SELECTED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.SELECTED, new Dali.Property.Value( value ) );
-    }
-  }
-  public string UnselectedStateImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( Button.Property.UNSELECTED_STATE_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.UNSELECTED_STATE_IMAGE, new Dali.Property.Value( value ) );
-    }
-  }
-  public string SelectedStateImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( Button.Property.SELECTED_STATE_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.SELECTED_STATE_IMAGE, new Dali.Property.Value( value ) );
-    }
-  }
-  public string DisabledStateImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( Button.Property.DISABLED_STATE_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.DISABLED_STATE_IMAGE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color UnselectedColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Button.Property.UNSELECTED_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Button.Property.UNSELECTED_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color SelectedColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Button.Property.SELECTED_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Button.Property.SELECTED_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map Label
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( Button.Property.LABEL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.LABEL, new Dali.Property.Value( value ) );
-    }
-  }
-  public string LabelText
-  {
-    get
-    {
-      string temp;
-      GetProperty( Button.Property.LABEL_TEXT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.LABEL_TEXT, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
 %}
 %enddef
 
index bcb12ca..489af5a 100644 (file)
 
     /**
      * @brief Event for KeyInputFocusGained signal which can be used to subscribe/unsubscribe the event handler
-     * (in the type of KeyInputFocusGainedEventHandler-DaliEventHandler<object,KeyInputFocusGainedEventArgs>)
+     * (in the type of KeyInputFocusGainedEventHandler-DaliEventHandler<object,KeyInputFocusGainedEventArgs>) 
      * provided by the user. KeyInputFocusGained signal is emitted when the control gets Key Input Focus.
      */
     public event DaliEventHandler<object,KeyInputFocusGainedEventArgs> KeyInputFocusGained
 
     /**
      * @brief Event for KeyInputFocusLost signal which can be used to subscribe/unsubscribe the event handler
-     * (in the type of KeyInputFocusLostEventHandler-DaliEventHandler<object,KeyInputFocusLostEventArgs>)
+     * (in the type of KeyInputFocusLostEventHandler-DaliEventHandler<object,KeyInputFocusLostEventArgs>) 
      * provided by the user. KeyInputFocusLost signal is emitted when the control loses Key Input Focus.
      */
     public event DaliEventHandler<object,KeyInputFocusLostEventArgs> KeyInputFocusLost
 
     /**
      * @brief Event for KeyPressed signal which can be used to subscribe/unsubscribe the event handler
-     * (in the type of KeyEventEventHandler-DaliEventHandlerWithReturnType<object,KeyEventArgs,bool>)
+     * (in the type of KeyEventEventHandler-DaliEventHandlerWithReturnType<object,KeyEventArgs,bool>) 
      * provided by the user. KeyPressed signal is emitted when key event is received.
      */
     public event DaliEventHandlerWithReturnType<object,KeyEventArgs,bool> KeyPressed
       return ret;
     }
 
-/* Properties earlier added by Ruby Script */
-
-  public Dali.CSharp.Size CellIndex
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( TableView.ChildProperty.CELL_INDEX).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TableView.ChildProperty.CELL_INDEX, new Dali.Property.Value( value ) );
-    }
-  }
-  public float RowSpan
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TableView.ChildProperty.ROW_SPAN).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TableView.ChildProperty.ROW_SPAN, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ColumnSpan
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TableView.ChildProperty.COLUMN_SPAN).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TableView.ChildProperty.COLUMN_SPAN, new Dali.Property.Value( value ) );
-    }
-  }
-  public string CellHorizontalAlignment
-  {
-    get
-    {
-      string temp;
-      GetProperty( TableView.ChildProperty.CELL_HORIZONTAL_ALIGNMENT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TableView.ChildProperty.CELL_HORIZONTAL_ALIGNMENT, new Dali.Property.Value( value ) );
-    }
-  }
-  public string CellVerticalAlignment
-  {
-    get
-    {
-      string temp;
-      GetProperty( TableView.ChildProperty.CELL_VERTICAL_ALIGNMENT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TableView.ChildProperty.CELL_VERTICAL_ALIGNMENT, new Dali.Property.Value( value ) );
-    }
-  }
-
-  public float Flex
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( FlexContainer.ChildProperty.FLEX).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( FlexContainer.ChildProperty.FLEX, new Dali.Property.Value( value ) );
-    }
-  }
-  public int AlignSelf
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( FlexContainer.ChildProperty.ALIGN_SELF).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( FlexContainer.ChildProperty.ALIGN_SELF, new Dali.Property.Value( value ) );
-    }
-  }
-  public Vector4 FlexMargin
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( FlexContainer.ChildProperty.FLEX_MARGIN).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( FlexContainer.ChildProperty.FLEX_MARGIN, new Dali.Property.Value( value ) );
-    }
-  }
-
-  public string StyleName
-  {
-    get
-    {
-      string temp;
-      GetProperty( View.Property.STYLE_NAME).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( View.Property.STYLE_NAME, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color BackgroundColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( View.Property.BACKGROUND_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( View.Property.BACKGROUND_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map BackgroundImage
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( View.Property.BACKGROUND_IMAGE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( View.Property.BACKGROUND_IMAGE, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool KeyInputFocus
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( View.Property.KEY_INPUT_FOCUS).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( View.Property.KEY_INPUT_FOCUS, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map Background
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( View.Property.BACKGROUND).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( View.Property.BACKGROUND, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
     %}
 
     %enddef
index e00a6ef..d70708a 100644 (file)
@@ -79,155 +79,6 @@ using System.Runtime.InteropServices;
      }
   }
 
-/* Properties earlier added by Ruby Script */
-
-  public float MinimumSwipeSpeed
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ItemView.Property.MINIMUM_SWIPE_SPEED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ItemView.Property.MINIMUM_SWIPE_SPEED, new Dali.Property.Value( value ) );
-    }
-  }
-  public float MinimumSwipeDistance
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ItemView.Property.MINIMUM_SWIPE_DISTANCE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ItemView.Property.MINIMUM_SWIPE_DISTANCE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float WheelScrollDistanceStep
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ItemView.Property.WHEEL_SCROLL_DISTANCE_STEP).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ItemView.Property.WHEEL_SCROLL_DISTANCE_STEP, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool SnapToItemEnabled
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( ItemView.Property.SNAP_TO_ITEM_ENABLED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ItemView.Property.SNAP_TO_ITEM_ENABLED, new Dali.Property.Value( value ) );
-    }
-  }
-  public float RefreshInterval
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ItemView.Property.REFRESH_INTERVAL).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ItemView.Property.REFRESH_INTERVAL, new Dali.Property.Value( value ) );
-    }
-  }
-  public float LayoutPosition
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ItemView.Property.LAYOUT_POSITION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ItemView.Property.LAYOUT_POSITION, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ScrollSpeed
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ItemView.Property.SCROLL_SPEED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ItemView.Property.SCROLL_SPEED, new Dali.Property.Value( value ) );
-    }
-  }
-  public float Overshoot
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ItemView.Property.OVERSHOOT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ItemView.Property.OVERSHOOT, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size ScrollDirection
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( ItemView.Property.SCROLL_DIRECTION).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( ItemView.Property.SCROLL_DIRECTION, new Dali.Property.Value( value ) );
-    }
-  }
-  public int LayoutOrientation
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( ItemView.Property.LAYOUT_ORIENTATION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ItemView.Property.LAYOUT_ORIENTATION, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ScrollContentSize
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ItemView.Property.SCROLL_CONTENT_SIZE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ItemView.Property.SCROLL_CONTENT_SIZE, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
 %}
 %enddef
 
index a458e6b..8be2725 100644 (file)
@@ -366,51 +366,6 @@ public class PageTurnFinishedEventArgs : EventArgs
     return ret;
   }
 
-/* Properties earlier added by Ruby Script */
-
-  public Dali.CSharp.Size PageSize
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PageTurnView.Property.PAGE_SIZE).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( PageTurnView.Property.PAGE_SIZE, new Dali.Property.Value( value ) );
-    }
-  }
-  public int CurrentPageId
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( PageTurnView.Property.CURRENT_PAGE_ID).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( PageTurnView.Property.CURRENT_PAGE_ID, new Dali.Property.Value( value ) );
-    }
-  }
-  public Vector2 SpineShadow
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PageTurnView.Property.SPINE_SHADOW).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( PageTurnView.Property.SPINE_SHADOW, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
 %}
 
 %enddef
index 2bcecb5..d284012 100644 (file)
@@ -118,74 +118,6 @@ public static ClassName Get ## ClassName ## FromPtr(global::System.IntPtr cPtr)
     return ret;
   }
 
-/* Properties earlier added by Ruby Script */
-
-  public Dali.CSharp.Size ScreenPosition
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PanGestureDetector.Property.SCREEN_POSITION).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-}  public Dali.CSharp.Size ScreenDisplacement
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PanGestureDetector.Property.SCREEN_DISPLACEMENT).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-}  public Dali.CSharp.Size ScreenVelocity
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PanGestureDetector.Property.SCREEN_VELOCITY).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-}  public Dali.CSharp.Size LocalPosition
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PanGestureDetector.Property.LOCAL_POSITION).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-}  public Dali.CSharp.Size LocalDisplacement
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PanGestureDetector.Property.LOCAL_DISPLACEMENT).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-}  public Dali.CSharp.Size LocalVelocity
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PanGestureDetector.Property.LOCAL_VELOCITY).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-}  public bool Panning
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( PanGestureDetector.Property.PANNING).Get( ref temp );
-      return temp;
-    }
-}
-
-/* Properties ends */
-
 %}
 
 %enddef
index 1186336..fd2b16f 100644 (file)
@@ -288,274 +288,6 @@ using System.Runtime.InteropServices;
         _popUpHiddenEventHandler(this, e);
      }
   }
-
-/* Properties earlier added by Ruby Script */
-
-  public Dali.Property.Map Title
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( Popup.Property.TITLE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.TITLE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map Content
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( Popup.Property.CONTENT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.CONTENT, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map Footer
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( Popup.Property.FOOTER).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.FOOTER, new Dali.Property.Value( value ) );
-    }
-  }
-  public string DisplayState
-  {
-    get
-    {
-      string temp;
-      GetProperty( Popup.Property.DISPLAY_STATE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.DISPLAY_STATE, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool TouchTransparent
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Popup.Property.TOUCH_TRANSPARENT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.TOUCH_TRANSPARENT, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool TailVisibility
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Popup.Property.TAIL_VISIBILITY).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.TAIL_VISIBILITY, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Position TailPosition
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Popup.Property.TAIL_POSITION).Get(  temp );
-      Dali.CSharp.Position ret = new Dali.CSharp.Position(temp.x, temp.y, temp.z);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Popup.Property.TAIL_POSITION, new Dali.Property.Value( value ) );
-    }
-  }
-  public string ContextualMode
-  {
-    get
-    {
-      string temp;
-      GetProperty( Popup.Property.CONTEXTUAL_MODE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.CONTEXTUAL_MODE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float AnimationDuration
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Popup.Property.ANIMATION_DURATION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.ANIMATION_DURATION, new Dali.Property.Value( value ) );
-    }
-  }
-  public string AnimationMode
-  {
-    get
-    {
-      string temp;
-      GetProperty( Popup.Property.ANIMATION_MODE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.ANIMATION_MODE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map EntryAnimation
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( Popup.Property.ENTRY_ANIMATION).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.ENTRY_ANIMATION, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map ExitAnimation
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( Popup.Property.EXIT_ANIMATION).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.EXIT_ANIMATION, new Dali.Property.Value( value ) );
-    }
-  }
-  public int AutoHideDelay
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Popup.Property.AUTO_HIDE_DELAY).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.AUTO_HIDE_DELAY, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool BackingEnabled
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Popup.Property.BACKING_ENABLED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.BACKING_ENABLED, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color BackingColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Popup.Property.BACKING_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Popup.Property.BACKING_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public string PopupBackgroundImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( Popup.Property.POPUP_BACKGROUND_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.POPUP_BACKGROUND_IMAGE, new Dali.Property.Value( value ) );
-    }
-  }
-  public string TailUpImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( Popup.Property.TAIL_UP_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.TAIL_UP_IMAGE, new Dali.Property.Value( value ) );
-    }
-  }
-  public string TailDownImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( Popup.Property.TAIL_DOWN_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.TAIL_DOWN_IMAGE, new Dali.Property.Value( value ) );
-    }
-  }
-  public string TailLeftImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( Popup.Property.TAIL_LEFT_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.TAIL_LEFT_IMAGE, new Dali.Property.Value( value ) );
-    }
-  }
-  public string TailRightImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( Popup.Property.TAIL_RIGHT_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.TAIL_RIGHT_IMAGE, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
 %}
 %enddef
 
index ee67b1f..9c3f25b 100644 (file)
@@ -82,7 +82,7 @@ public class FinishedEventArgs : EventArgs
      }
   }
 
- private void OnFinished(IntPtr renderTask)
+ private void OnFinished(IntPtr actor, IntPtr renderTask)
   {
    FinishedEventArgs e = new FinishedEventArgs();
 
@@ -104,78 +104,18 @@ public static ClassName Get ## ClassName ## FromPtr(global::System.IntPtr cPtr)
     return ret;
   }
 
-/* Properties earlier added by Ruby Script */
-
-  public Dali.CSharp.Size ViewportPosition
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( RenderTask.Property.VIEWPORT_POSITION).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( RenderTask.Property.VIEWPORT_POSITION, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size ViewportSize
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( RenderTask.Property.VIEWPORT_SIZE).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( RenderTask.Property.VIEWPORT_SIZE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color ClearColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( RenderTask.Property.CLEAR_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( RenderTask.Property.CLEAR_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool RequiresSync
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( RenderTask.Property.REQUIRES_SYNC).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( RenderTask.Property.REQUIRES_SYNC, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
 %}
 
 %enddef
 
-%define DALI_renderTask_EVENTHANDLER_PARAM(NameSpace, ClassName)
+%define DALI_renderTask_EVENTHANDLER_PARAM( NameSpace, ClassName)
 
-  RenderTask_EVENTHANDLER_TYPEMAP_EVENTARG(NameSpace, ClassName);
-  RenderTask_EVENTHANDLER_TYPEMAP_HELPER(NameSpace, ClassName);
+  RenderTask_EVENTHANDLER_TYPEMAP_EVENTARG( NameSpace, ClassName);
+  RenderTask_EVENTHANDLER_TYPEMAP_HELPER( NameSpace, ClassName);
 
 %enddef
 
 namespace Dali
 {
-  DALI_renderTask_EVENTHANDLER_PARAM(Dali, RenderTask);
+  DALI_renderTask_EVENTHANDLER_PARAM( Dali, RenderTask);
 }
index 7613e20..713e728 100644 (file)
@@ -230,146 +230,6 @@ public class CompletedEventArgs : EventArgs
 
   }
 
-/* Properties earlier added by Ruby Script */
-
-  public Dali.CSharp.Color OvershootEffectColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Scrollable.Property.OVERSHOOT_EFFECT_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Scrollable.Property.OVERSHOOT_EFFECT_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public float OvershootAnimationSpeed
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Scrollable.Property.OVERSHOOT_ANIMATION_SPEED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Scrollable.Property.OVERSHOOT_ANIMATION_SPEED, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool OvershootEnabled
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Scrollable.Property.OVERSHOOT_ENABLED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Scrollable.Property.OVERSHOOT_ENABLED, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size OvershootSize
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( Scrollable.Property.OVERSHOOT_SIZE).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Scrollable.Property.OVERSHOOT_SIZE, new Dali.Property.Value( value ) );
-    }
-  }
-  public int ScrollToAlphaFunction
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Scrollable.Property.SCROLL_TO_ALPHA_FUNCTION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Scrollable.Property.SCROLL_TO_ALPHA_FUNCTION, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size ScrollRelativePosition
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( Scrollable.Property.SCROLL_RELATIVE_POSITION).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Scrollable.Property.SCROLL_RELATIVE_POSITION, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size ScrollPositionMin
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( Scrollable.Property.SCROLL_POSITION_MIN).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Scrollable.Property.SCROLL_POSITION_MIN, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size ScrollPositionMax
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( Scrollable.Property.SCROLL_POSITION_MAX).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Scrollable.Property.SCROLL_POSITION_MAX, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool CanScrollVertical
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Scrollable.Property.CAN_SCROLL_VERTICAL).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Scrollable.Property.CAN_SCROLL_VERTICAL, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool CanScrollHorizontal
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Scrollable.Property.CAN_SCROLL_HORIZONTAL).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Scrollable.Property.CAN_SCROLL_HORIZONTAL, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
 %}
 
 %enddef
index 7734601..d51fb3d 100644 (file)
@@ -54,7 +54,7 @@ public class ScrollPositionIntervalReachedEventArgs : EventArgs
   private delegate void PanFinishedEventCallbackDelegate();
   private DaliEventHandler<object,PanFinishedEventArgs> _scrollBarPanFinishedEventHandler;
   private PanFinishedEventCallbackDelegate _scrollBarPanFinishedEventCallbackDelegate;
-
+  
   [UnmanagedFunctionPointer(CallingConvention.StdCall)]
   private delegate void ScrollPositionIntervalReachedEventCallbackDelegate();
   private DaliEventHandler<object,ScrollPositionIntervalReachedEventArgs> _scrollBarScrollPositionIntervalReachedEventHandler;
@@ -147,127 +147,6 @@ public class ScrollPositionIntervalReachedEventArgs : EventArgs
      }
   }
 
-/* Properties earlier added by Ruby Script */
-
-  public string ScrollDirection
-  {
-    get
-    {
-      string temp;
-      GetProperty( ScrollBar.Property.SCROLL_DIRECTION).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollBar.Property.SCROLL_DIRECTION, new Dali.Property.Value( value ) );
-    }
-  }
-  public string IndicatorHeightPolicy
-  {
-    get
-    {
-      string temp;
-      GetProperty( ScrollBar.Property.INDICATOR_HEIGHT_POLICY).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollBar.Property.INDICATOR_HEIGHT_POLICY, new Dali.Property.Value( value ) );
-    }
-  }
-  public float IndicatorFixedHeight
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ScrollBar.Property.INDICATOR_FIXED_HEIGHT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollBar.Property.INDICATOR_FIXED_HEIGHT, new Dali.Property.Value( value ) );
-    }
-  }
-  public float IndicatorShowDuration
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ScrollBar.Property.INDICATOR_SHOW_DURATION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollBar.Property.INDICATOR_SHOW_DURATION, new Dali.Property.Value( value ) );
-    }
-  }
-  public float IndicatorHideDuration
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ScrollBar.Property.INDICATOR_HIDE_DURATION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollBar.Property.INDICATOR_HIDE_DURATION, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Array ScrollPositionIntervals
-  {
-    get
-    {
-      Dali.Property.Array temp = new Dali.Property.Array();
-      GetProperty( ScrollBar.Property.SCROLL_POSITION_INTERVALS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollBar.Property.SCROLL_POSITION_INTERVALS, new Dali.Property.Value( value ) );
-    }
-  }
-  public float IndicatorMinimumHeight
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ScrollBar.Property.INDICATOR_MINIMUM_HEIGHT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollBar.Property.INDICATOR_MINIMUM_HEIGHT, new Dali.Property.Value( value ) );
-    }
-  }
-  public float IndicatorStartPadding
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ScrollBar.Property.INDICATOR_START_PADDING).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollBar.Property.INDICATOR_START_PADDING, new Dali.Property.Value( value ) );
-    }
-  }
-  public float IndicatorEndPadding
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ScrollBar.Property.INDICATOR_END_PADDING).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollBar.Property.INDICATOR_END_PADDING, new Dali.Property.Value( value ) );
-    }
-  }
-/* Properties ends */
-
 %}
 %enddef
 
index 8c7ca7e..97622fa 100644 (file)
@@ -109,242 +109,6 @@ public class SnapStartedEventArgs : EventArgs
      }
   }
 
-/* Properties earlier added by Ruby Script */
-
-  public bool WrapEnabled
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( ScrollView.Property.WRAP_ENABLED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollView.Property.WRAP_ENABLED, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool PanningEnabled
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( ScrollView.Property.PANNING_ENABLED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollView.Property.PANNING_ENABLED, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool AxisAutoLockEnabled
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( ScrollView.Property.AXIS_AUTO_LOCK_ENABLED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollView.Property.AXIS_AUTO_LOCK_ENABLED, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size WheelScrollDistanceStep
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( ScrollView.Property.WHEEL_SCROLL_DISTANCE_STEP).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( ScrollView.Property.WHEEL_SCROLL_DISTANCE_STEP, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size ScrollPosition
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( ScrollView.Property.SCROLL_POSITION).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( ScrollView.Property.SCROLL_POSITION, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size ScrollPrePosition
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( ScrollView.Property.SCROLL_PRE_POSITION).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( ScrollView.Property.SCROLL_PRE_POSITION, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size ScrollPrePositionMax
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( ScrollView.Property.SCROLL_PRE_POSITION_MAX).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( ScrollView.Property.SCROLL_PRE_POSITION_MAX, new Dali.Property.Value( value ) );
-    }
-  }
-  public float OvershootX
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ScrollView.Property.OVERSHOOT_X).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollView.Property.OVERSHOOT_X, new Dali.Property.Value( value ) );
-    }
-  }
-  public float OvershootY
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ScrollView.Property.OVERSHOOT_Y).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollView.Property.OVERSHOOT_Y, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size ScrollFinal
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( ScrollView.Property.SCROLL_FINAL).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( ScrollView.Property.SCROLL_FINAL, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool Wrap
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( ScrollView.Property.WRAP).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollView.Property.WRAP, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool Panning
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( ScrollView.Property.PANNING).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollView.Property.PANNING, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool Scrolling
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( ScrollView.Property.SCROLLING).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollView.Property.SCROLLING, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size ScrollDomainSize
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( ScrollView.Property.SCROLL_DOMAIN_SIZE).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( ScrollView.Property.SCROLL_DOMAIN_SIZE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size ScrollDomainOffset
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( ScrollView.Property.SCROLL_DOMAIN_OFFSET).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( ScrollView.Property.SCROLL_DOMAIN_OFFSET, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size ScrollPositionDelta
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( ScrollView.Property.SCROLL_POSITION_DELTA).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( ScrollView.Property.SCROLL_POSITION_DELTA, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Position StartPagePosition
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( ScrollView.Property.START_PAGE_POSITION).Get(  temp );
-      Dali.CSharp.Position ret = new Dali.CSharp.Position(temp.x, temp.y, temp.z);
-      return ret;
-    }
-    set
-    {
-      SetProperty( ScrollView.Property.START_PAGE_POSITION, new Dali.Property.Value( value ) );
-    }
-  }
-
-
-/* Properties ends */
-
 %}
 
 %enddef
index 4a1b8b5..02ef3da 100644 (file)
@@ -282,207 +282,6 @@ public class MarkReachedEventArgs : EventArgs
     return ret;
   }
 
-/* Properties earlier added by Ruby Script */
-
-  public float LowerBound
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Slider.Property.LOWER_BOUND).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.LOWER_BOUND, new Dali.Property.Value( value ) );
-    }
-  }
-  public float UpperBound
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Slider.Property.UPPER_BOUND).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.UPPER_BOUND, new Dali.Property.Value( value ) );
-    }
-  }
-  public float Value
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Slider.Property.VALUE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.VALUE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map TrackVisual
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( Slider.Property.TRACK_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.TRACK_VISUAL, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map HandleVisual
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( Slider.Property.HANDLE_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.HANDLE_VISUAL, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map ProgressVisual
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( Slider.Property.PROGRESS_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.PROGRESS_VISUAL, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map PopupVisual
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( Slider.Property.POPUP_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.POPUP_VISUAL, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map PopupArrowVisual
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( Slider.Property.POPUP_ARROW_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.POPUP_ARROW_VISUAL, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color DisabledColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Slider.Property.DISABLED_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Slider.Property.DISABLED_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public int ValuePrecision
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Slider.Property.VALUE_PRECISION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.VALUE_PRECISION, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool ShowPopup
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Slider.Property.SHOW_POPUP).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.SHOW_POPUP, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool ShowValue
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Slider.Property.SHOW_VALUE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.SHOW_VALUE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Array Marks
-  {
-    get
-    {
-      Dali.Property.Array temp = new Dali.Property.Array();
-      GetProperty( Slider.Property.MARKS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.MARKS, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool SnapToMarks
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Slider.Property.SNAP_TO_MARKS).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.SNAP_TO_MARKS, new Dali.Property.Value( value ) );
-    }
-  }
-  public float MarkTolerance
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Slider.Property.MARK_TOLERANCE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.MARK_TOLERANCE, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
 %}
 
 %enddef
index 44db9d0..74693cd 100644 (file)
@@ -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;
 }
index e5bf62d..738ea21 100644 (file)
@@ -58,7 +58,7 @@ public class TextChangedEventArgs : EventArgs
 
   /**
     * @brief Event for TextChanged signal which can be used to subscribe/unsubscribe the event handler
-    * (in the type of TextChangedEventHandler-DaliEventHandler<object,TextChangedEventArgs>)
+    * (in the type of TextChangedEventHandler-DaliEventHandler<object,TextChangedEventArgs>) 
     * provided by the user. TextChanged signal is emitted when the text changes.
     */
   public event DaliEventHandler<object,TextChangedEventArgs> TextChanged
@@ -113,536 +113,6 @@ public class TextChangedEventArgs : EventArgs
     return ret;
   }
 
-/* Properties earlier added by Ruby Script */
-
-  public int RenderingBackend
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TextEditor.Property.RENDERING_BACKEND).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.RENDERING_BACKEND, new Dali.Property.Value( value ) );
-    }
-  }
-  public string Text
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextEditor.Property.TEXT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.TEXT, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color TextColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextEditor.Property.TEXT_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.TEXT_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public string FontFamily
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextEditor.Property.FONT_FAMILY).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.FONT_FAMILY, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map FontStyle
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextEditor.Property.FONT_STYLE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.FONT_STYLE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float PointSize
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextEditor.Property.POINT_SIZE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.POINT_SIZE, new Dali.Property.Value( value ) );
-    }
-  }
-  public string HorizontalAlignment
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextEditor.Property.HORIZONTAL_ALIGNMENT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.HORIZONTAL_ALIGNMENT, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ScrollThreshold
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextEditor.Property.SCROLL_THRESHOLD).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SCROLL_THRESHOLD, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ScrollSpeed
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextEditor.Property.SCROLL_SPEED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SCROLL_SPEED, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color PrimaryCursorColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextEditor.Property.PRIMARY_CURSOR_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.PRIMARY_CURSOR_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color SecondaryCursorColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextEditor.Property.SECONDARY_CURSOR_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SECONDARY_CURSOR_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool EnableCursorBlink
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( TextEditor.Property.ENABLE_CURSOR_BLINK).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.ENABLE_CURSOR_BLINK, new Dali.Property.Value( value ) );
-    }
-  }
-  public float CursorBlinkInterval
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextEditor.Property.CURSOR_BLINK_INTERVAL).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.CURSOR_BLINK_INTERVAL, new Dali.Property.Value( value ) );
-    }
-  }
-  public float CursorBlinkDuration
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextEditor.Property.CURSOR_BLINK_DURATION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.CURSOR_BLINK_DURATION, new Dali.Property.Value( value ) );
-    }
-  }
-  public int CursorWidth
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TextEditor.Property.CURSOR_WIDTH).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.CURSOR_WIDTH, new Dali.Property.Value( value ) );
-    }
-  }
-  public string GrabHandleImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextEditor.Property.GRAB_HANDLE_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.GRAB_HANDLE_IMAGE, new Dali.Property.Value( value ) );
-    }
-  }
-  public string GrabHandlePressedImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextEditor.Property.GRAB_HANDLE_PRESSED_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.GRAB_HANDLE_PRESSED_IMAGE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map SelectionHandleImageLeft
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextEditor.Property.SELECTION_HANDLE_IMAGE_LEFT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SELECTION_HANDLE_IMAGE_LEFT, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map SelectionHandleImageRight
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextEditor.Property.SELECTION_HANDLE_IMAGE_RIGHT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SELECTION_HANDLE_IMAGE_RIGHT, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map SelectionHandlePressedImageLeft
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextEditor.Property.SELECTION_HANDLE_PRESSED_IMAGE_LEFT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SELECTION_HANDLE_PRESSED_IMAGE_LEFT, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map SelectionHandlePressedImageRight
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextEditor.Property.SELECTION_HANDLE_PRESSED_IMAGE_RIGHT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SELECTION_HANDLE_PRESSED_IMAGE_RIGHT, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map SelectionHandleMarkerImageLeft
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextEditor.Property.SELECTION_HANDLE_MARKER_IMAGE_LEFT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SELECTION_HANDLE_MARKER_IMAGE_LEFT, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map SelectionHandleMarkerImageRight
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextEditor.Property.SELECTION_HANDLE_MARKER_IMAGE_RIGHT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SELECTION_HANDLE_MARKER_IMAGE_RIGHT, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color SelectionHighlightColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextEditor.Property.SELECTION_HIGHLIGHT_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SELECTION_HIGHLIGHT_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public RectInteger DecorationBoundingBox
-  {
-    get
-    {
-      RectInteger temp = new RectInteger(0,0,0,0);
-      GetProperty( TextEditor.Property.DECORATION_BOUNDING_BOX).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.DECORATION_BOUNDING_BOX, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool EnableMarkup
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( TextEditor.Property.ENABLE_MARKUP).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.ENABLE_MARKUP, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color InputColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextEditor.Property.INPUT_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.INPUT_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public string InputFontFamily
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextEditor.Property.INPUT_FONT_FAMILY).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.INPUT_FONT_FAMILY, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map InputFontStyle
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextEditor.Property.INPUT_FONT_STYLE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.INPUT_FONT_STYLE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float InputPointSize
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextEditor.Property.INPUT_POINT_SIZE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.INPUT_POINT_SIZE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float LineSpacing
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextEditor.Property.LINE_SPACING).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.LINE_SPACING, new Dali.Property.Value( value ) );
-    }
-  }
-  public float InputLineSpacing
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextEditor.Property.INPUT_LINE_SPACING).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.INPUT_LINE_SPACING, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map Underline
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextEditor.Property.UNDERLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.UNDERLINE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map InputUnderline
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextEditor.Property.INPUT_UNDERLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.INPUT_UNDERLINE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map Shadow
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextEditor.Property.SHADOW).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SHADOW, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map InputShadow
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextEditor.Property.INPUT_SHADOW).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.INPUT_SHADOW, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map Emboss
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextEditor.Property.EMBOSS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.EMBOSS, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map InputEmboss
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextEditor.Property.INPUT_EMBOSS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.INPUT_EMBOSS, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map Outline
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextEditor.Property.OUTLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.OUTLINE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map InputOutline
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextEditor.Property.INPUT_OUTLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.INPUT_OUTLINE, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
 %}
 
 %enddef
index b1ffe59..55a430d 100644 (file)
@@ -66,7 +66,7 @@ public class MaxLengthReachedEventArgs : EventArgs
   private delegate void TextChangedCallbackDelegate(IntPtr textField);
   private DaliEventHandler<object,TextChangedEventArgs> _textFieldTextChangedEventHandler;
   private TextChangedCallbackDelegate _textFieldTextChangedCallbackDelegate;
-
+  
   [UnmanagedFunctionPointer(CallingConvention.StdCall)]
   private delegate void MaxLengthReachedCallbackDelegate(IntPtr textField);
   private DaliEventHandler<object,MaxLengthReachedEventArgs> _textFieldMaxLengthReachedEventHandler;
@@ -170,630 +170,6 @@ public class MaxLengthReachedEventArgs : EventArgs
     return ret;
   }
 
-/* Properties earlier added by Ruby Script */
-
-  public int RenderingBackend
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TextField.Property.RENDERING_BACKEND).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.RENDERING_BACKEND, new Dali.Property.Value( value ) );
-    }
-  }
-  public string Text
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextField.Property.TEXT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.TEXT, new Dali.Property.Value( value ) );
-    }
-  }
-  public string PlaceholderText
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextField.Property.PLACEHOLDER_TEXT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.PLACEHOLDER_TEXT, new Dali.Property.Value( value ) );
-    }
-  }
-  public string PlaceholderTextFocused
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextField.Property.PLACEHOLDER_TEXT_FOCUSED).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.PLACEHOLDER_TEXT_FOCUSED, new Dali.Property.Value( value ) );
-    }
-  }
-  public string FontFamily
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextField.Property.FONT_FAMILY).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.FONT_FAMILY, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map FontStyle
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextField.Property.FONT_STYLE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.FONT_STYLE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float PointSize
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextField.Property.POINT_SIZE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.POINT_SIZE, new Dali.Property.Value( value ) );
-    }
-  }
-  public int MaxLength
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TextField.Property.MAX_LENGTH).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.MAX_LENGTH, new Dali.Property.Value( value ) );
-    }
-  }
-  public int ExceedPolicy
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TextField.Property.EXCEED_POLICY).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.EXCEED_POLICY, new Dali.Property.Value( value ) );
-    }
-  }
-  public string HorizontalAlignment
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextField.Property.HORIZONTAL_ALIGNMENT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.HORIZONTAL_ALIGNMENT, new Dali.Property.Value( value ) );
-    }
-  }
-  public string VerticalAlignment
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextField.Property.VERTICAL_ALIGNMENT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.VERTICAL_ALIGNMENT, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color TextColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextField.Property.TEXT_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TextField.Property.TEXT_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color PlaceholderTextColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextField.Property.PLACEHOLDER_TEXT_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TextField.Property.PLACEHOLDER_TEXT_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size ShadowOffset
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( TextField.Property.SHADOW_OFFSET).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SHADOW_OFFSET, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color ShadowColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextField.Property.SHADOW_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SHADOW_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color PrimaryCursorColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextField.Property.PRIMARY_CURSOR_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TextField.Property.PRIMARY_CURSOR_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color SecondaryCursorColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextField.Property.SECONDARY_CURSOR_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SECONDARY_CURSOR_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool EnableCursorBlink
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( TextField.Property.ENABLE_CURSOR_BLINK).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.ENABLE_CURSOR_BLINK, new Dali.Property.Value( value ) );
-    }
-  }
-  public float CursorBlinkInterval
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextField.Property.CURSOR_BLINK_INTERVAL).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.CURSOR_BLINK_INTERVAL, new Dali.Property.Value( value ) );
-    }
-  }
-  public float CursorBlinkDuration
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextField.Property.CURSOR_BLINK_DURATION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.CURSOR_BLINK_DURATION, new Dali.Property.Value( value ) );
-    }
-  }
-  public int CursorWidth
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TextField.Property.CURSOR_WIDTH).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.CURSOR_WIDTH, new Dali.Property.Value( value ) );
-    }
-  }
-  public string GrabHandleImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextField.Property.GRAB_HANDLE_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.GRAB_HANDLE_IMAGE, new Dali.Property.Value( value ) );
-    }
-  }
-  public string GrabHandlePressedImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextField.Property.GRAB_HANDLE_PRESSED_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.GRAB_HANDLE_PRESSED_IMAGE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ScrollThreshold
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextField.Property.SCROLL_THRESHOLD).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SCROLL_THRESHOLD, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ScrollSpeed
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextField.Property.SCROLL_SPEED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SCROLL_SPEED, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map SelectionHandleImageLeft
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextField.Property.SELECTION_HANDLE_IMAGE_LEFT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SELECTION_HANDLE_IMAGE_LEFT, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map SelectionHandleImageRight
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextField.Property.SELECTION_HANDLE_IMAGE_RIGHT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SELECTION_HANDLE_IMAGE_RIGHT, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map SelectionHandlePressedImageLeft
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextField.Property.SELECTION_HANDLE_PRESSED_IMAGE_LEFT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SELECTION_HANDLE_PRESSED_IMAGE_LEFT, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map SelectionHandlePressedImageRight
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextField.Property.SELECTION_HANDLE_PRESSED_IMAGE_RIGHT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SELECTION_HANDLE_PRESSED_IMAGE_RIGHT, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map SelectionHandleMarkerImageLeft
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextField.Property.SELECTION_HANDLE_MARKER_IMAGE_LEFT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SELECTION_HANDLE_MARKER_IMAGE_LEFT, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map SelectionHandleMarkerImageRight
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextField.Property.SELECTION_HANDLE_MARKER_IMAGE_RIGHT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SELECTION_HANDLE_MARKER_IMAGE_RIGHT, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color SelectionHighlightColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextField.Property.SELECTION_HIGHLIGHT_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SELECTION_HIGHLIGHT_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public RectInteger DecorationBoundingBox
-  {
-    get
-    {
-      RectInteger temp = new RectInteger(0,0,0,0);
-      GetProperty( TextField.Property.DECORATION_BOUNDING_BOX).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.DECORATION_BOUNDING_BOX, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map InputMethodSettings
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextField.Property.INPUT_METHOD_SETTINGS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.INPUT_METHOD_SETTINGS, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color InputColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextField.Property.INPUT_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TextField.Property.INPUT_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool EnableMarkup
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( TextField.Property.ENABLE_MARKUP).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.ENABLE_MARKUP, new Dali.Property.Value( value ) );
-    }
-  }
-  public string InputFontFamily
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextField.Property.INPUT_FONT_FAMILY).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.INPUT_FONT_FAMILY, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map InputFontStyle
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextField.Property.INPUT_FONT_STYLE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.INPUT_FONT_STYLE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float InputPointSize
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextField.Property.INPUT_POINT_SIZE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.INPUT_POINT_SIZE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map Underline
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextField.Property.UNDERLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.UNDERLINE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map InputUnderline
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextField.Property.INPUT_UNDERLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.INPUT_UNDERLINE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map Shadow
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextField.Property.SHADOW).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SHADOW, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map InputShadow
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextField.Property.INPUT_SHADOW).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.INPUT_SHADOW, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map Emboss
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextField.Property.EMBOSS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.EMBOSS, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map InputEmboss
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextField.Property.INPUT_EMBOSS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.INPUT_EMBOSS, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map Outline
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextField.Property.OUTLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.OUTLINE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map InputOutline
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextField.Property.INPUT_OUTLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.INPUT_OUTLINE, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
 %}
 
 %enddef
index 1bc0aee..7ef03e3 100644 (file)
@@ -114,63 +114,6 @@ public class FinishedEventArgs : EventArgs
     return ret;
   }
 
-/* Properties earlier added by Ruby Script */
-
-  public Dali.Property.Map Video
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( VideoView.Property.VIDEO).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( VideoView.Property.VIDEO, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool Looping
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( VideoView.Property.LOOPING).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( VideoView.Property.LOOPING, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool Muted
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( VideoView.Property.MUTED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( VideoView.Property.MUTED, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map Volume
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( VideoView.Property.VOLUME).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( VideoView.Property.VOLUME, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
 %}
 
 %enddef
diff --git a/plugins/dali-swig/SWIG/flexContainer.i b/plugins/dali-swig/SWIG/flexContainer.i
deleted file mode 100644 (file)
index 67298e6..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-%define FLEXCONTAINER_PROPERTIES_HELPER(NameSpace, ClassName)
-%typemap(cscode) NameSpace::ClassName %{
-
-/* Properties earlier added by Ruby Script */
-
-  public int ContentDirection
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( FlexContainer.Property.CONTENT_DIRECTION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( FlexContainer.Property.CONTENT_DIRECTION, new Dali.Property.Value( value ) );
-    }
-  }
-  public int FlexDirection
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( FlexContainer.Property.FLEX_DIRECTION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( FlexContainer.Property.FLEX_DIRECTION, new Dali.Property.Value( value ) );
-    }
-  }
-  public int FlexWrap
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( FlexContainer.Property.FLEX_WRAP).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( FlexContainer.Property.FLEX_WRAP, new Dali.Property.Value( value ) );
-    }
-  }
-  public int JustifyContent
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( FlexContainer.Property.JUSTIFY_CONTENT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( FlexContainer.Property.JUSTIFY_CONTENT, new Dali.Property.Value( value ) );
-    }
-  }
-  public int AlignItems
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( FlexContainer.Property.ALIGN_ITEMS).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( FlexContainer.Property.ALIGN_ITEMS, new Dali.Property.Value( value ) );
-    }
-  }
-  public int AlignContent
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( FlexContainer.Property.ALIGN_CONTENT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( FlexContainer.Property.ALIGN_CONTENT, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
-%}
-%enddef
-
-namespace Dali
-{
-  FLEXCONTAINER_PROPERTIES_HELPER(Dali::Toolkit, FlexContainer);
-}
-
-
diff --git a/plugins/dali-swig/SWIG/imageView.i b/plugins/dali-swig/SWIG/imageView.i
deleted file mode 100644 (file)
index 4e450bb..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-%define IMAGEVIEW_PROPERTIES_HELPER(NameSpace, ClassName)
-%typemap(cscode) NameSpace::ClassName %{
-
-/* Properties earlier added by Ruby Script */
-
-  public string ResourceUrl
-  {
-    get
-    {
-      string temp;
-      GetProperty( ImageView.Property.RESOURCE_URL).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ImageView.Property.RESOURCE_URL, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map ImageMap
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( ImageView.Property.IMAGE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ImageView.Property.IMAGE, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool PreMultipliedAlpha
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( ImageView.Property.PRE_MULTIPLIED_ALPHA).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ImageView.Property.PRE_MULTIPLIED_ALPHA, new Dali.Property.Value( value ) );
-    }
-  }
-  public Vector4 PixelArea
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( ImageView.Property.PIXEL_AREA).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ImageView.Property.PIXEL_AREA, new Dali.Property.Value( value ) );
-    }
-  }
-/* Properties ends */
-
-%}
-%enddef
-
-namespace Dali
-{
-  IMAGEVIEW_PROPERTIES_HELPER(Dali::Toolkit, ImageView);
-}
-
diff --git a/plugins/dali-swig/SWIG/layer.i b/plugins/dali-swig/SWIG/layer.i
deleted file mode 100644 (file)
index d26912f..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-%define LAYER_PROPERTIES_HELPER(NameSpace, ClassName)
-%typemap(cscode) NameSpace::ClassName %{
-
-/* Properties earlier added by Ruby Script */
-
-  public bool ClippingEnable
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Layer.Property.CLIPPING_ENABLE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Layer.Property.CLIPPING_ENABLE, new Dali.Property.Value( value ) );
-    }
-  }
-  public RectInteger ClippingBox
-  {
-    get
-    {
-      RectInteger temp = new RectInteger(0,0,0,0);
-      GetProperty( Layer.Property.CLIPPING_BOX).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Layer.Property.CLIPPING_BOX, new Dali.Property.Value( value ) );
-    }
-  }
-  public string Behavior
-  {
-    get
-    {
-      string temp;
-      GetProperty( Layer.Property.BEHAVIOR).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Layer.Property.BEHAVIOR, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
-%}
-%enddef
-
-namespace Dali
-{
-  LAYER_PROPERTIES_HELPER(Dali, Layer);
-
-}
diff --git a/plugins/dali-swig/SWIG/linearConstrainer.i b/plugins/dali-swig/SWIG/linearConstrainer.i
deleted file mode 100644 (file)
index dd930b4..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-%define LINEARCONSTRAINER_PROPERTIES_HELPER(NameSpace, ClassName)
-%typemap(cscode) NameSpace::ClassName %{
-
-/* Properties earlier added by Ruby Script */
-
-  public Dali.Property.Array Value
-  {
-    get
-    {
-      Dali.Property.Array temp = new Dali.Property.Array();
-      GetProperty( LinearConstrainer.Property.VALUE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( LinearConstrainer.Property.VALUE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Array Progress
-  {
-    get
-    {
-      Dali.Property.Array temp = new Dali.Property.Array();
-      GetProperty( LinearConstrainer.Property.PROGRESS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( LinearConstrainer.Property.PROGRESS, new Dali.Property.Value( value ) );
-    }
-  }
-
-
-/* Properties ends */
-
-%}
-%enddef
-
-namespace Dali
-{
-  LINEARCONSTRAINER_PROPERTIES_HELPER(Dali, LinearConstrainer);
-}
diff --git a/plugins/dali-swig/SWIG/model3DView.i b/plugins/dali-swig/SWIG/model3DView.i
deleted file mode 100644 (file)
index ed8c24d..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-%define MODEL3DVIEW_PROPERTIES_HELPER(NameSpace, ClassName)
-%typemap(cscode) NameSpace::ClassName %{
-
-/* Properties earlier added by Ruby Script */
-
-  public string GeometryUrl
-  {
-    get
-    {
-      string temp;
-      GetProperty( Model3dView.Property.GEOMETRY_URL).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Model3dView.Property.GEOMETRY_URL, new Dali.Property.Value( value ) );
-    }
-  }
-  public string MaterialUrl
-  {
-    get
-    {
-      string temp;
-      GetProperty( Model3dView.Property.MATERIAL_URL).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Model3dView.Property.MATERIAL_URL, new Dali.Property.Value( value ) );
-    }
-  }
-  public string ImagesUrl
-  {
-    get
-    {
-      string temp;
-      GetProperty( Model3dView.Property.IMAGES_URL).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Model3dView.Property.IMAGES_URL, new Dali.Property.Value( value ) );
-    }
-  }
-  public int IlluminationType
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Model3dView.Property.ILLUMINATION_TYPE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Model3dView.Property.ILLUMINATION_TYPE, new Dali.Property.Value( value ) );
-    }
-  }
-  public string Texture0Url
-  {
-    get
-    {
-      string temp;
-      GetProperty( Model3dView.Property.TEXTURE0_URL).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Model3dView.Property.TEXTURE0_URL, new Dali.Property.Value( value ) );
-    }
-  }
-  public string Texture1Url
-  {
-    get
-    {
-      string temp;
-      GetProperty( Model3dView.Property.TEXTURE1_URL).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Model3dView.Property.TEXTURE1_URL, new Dali.Property.Value( value ) );
-    }
-  }
-  public string Texture2Url
-  {
-    get
-    {
-      string temp;
-      GetProperty( Model3dView.Property.TEXTURE2_URL).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Model3dView.Property.TEXTURE2_URL, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Position LightPosition
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Model3dView.Property.LIGHT_POSITION).Get(  temp );
-      Dali.CSharp.Position ret = new Dali.CSharp.Position(temp.x, temp.y, temp.z);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Model3dView.Property.LIGHT_POSITION, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
-%}
-%enddef
-
-namespace Dali
-{
-  MODEL3DVIEW_PROPERTIES_HELPER(Dali::Toolkit, Model3dView);
-}
diff --git a/plugins/dali-swig/SWIG/pageTurnLandscapeView.i b/plugins/dali-swig/SWIG/pageTurnLandscapeView.i
deleted file mode 100644 (file)
index 4e0e8f0..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-%define PageTurnLandscapeView_PROPERTIES_HELPER(NameSpace, ClassName)
-%typemap(cscode) NameSpace::ClassName %{
-
-/* Constructor and APIs with high level class Size */
-
-  public PageTurnLandscapeView (PageFactory pageFactory, Dali.CSharp.Size pageSize) : this (NDalicPINVOKE.PageTurnLandscapeView_New(PageFactory.getCPtr(pageFactory), Vector2.getCPtr(new Vector2(pageSize.W,pageSize.H))), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-/* constructor and APIs end */
-
-%}
-%enddef
-
-namespace Dali
-{
-  PageTurnLandscapeView_PROPERTIES_HELPER( Dali::Toolkit, PageTurnLandscapeView);
-}
diff --git a/plugins/dali-swig/SWIG/pageTurnPortraitView.i b/plugins/dali-swig/SWIG/pageTurnPortraitView.i
deleted file mode 100644 (file)
index 86fc36d..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-%define PageTurnPortraitView_PROPERTIES_HELPER(NameSpace, ClassName)
-%typemap(cscode) NameSpace::ClassName %{
-
-/* Constructor and APIs with high level class Size */
-
-  public PageTurnPortraitView (PageFactory pageFactory, Dali.CSharp.Size pageSize) : this (NDalicPINVOKE.PageTurnPortraitView_New(PageFactory.getCPtr(pageFactory), Vector2.getCPtr(new Vector2(pageSize.W,pageSize.H))), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-/* constructor and APIs end */
-
-%}
-%enddef
-
-namespace Dali
-{
-  PageTurnPortraitView_PROPERTIES_HELPER( Dali::Toolkit, PageTurnPortraitView);
-}
diff --git a/plugins/dali-swig/SWIG/path.i b/plugins/dali-swig/SWIG/path.i
deleted file mode 100644 (file)
index 20ae90f..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-%define PATH_PROPERTIES_HELPER(NameSpace, ClassName)
-%typemap(cscode) NameSpace::ClassName %{
-
-/* Properties earlier added by Ruby Script */
-
-  public Dali.Property.Array Points
-  {
-    get
-    {
-      Dali.Property.Array temp = new Dali.Property.Array();
-      GetProperty( Path.Property.POINTS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Path.Property.POINTS, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Array ControlPoints
-  {
-    get
-    {
-      Dali.Property.Array temp = new Dali.Property.Array();
-      GetProperty( Path.Property.CONTROL_POINTS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Path.Property.CONTROL_POINTS, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
-%}
-%enddef
-
-namespace Dali
-{
-  PATH_PROPERTIES_HELPER(Dali, Path);
-}
diff --git a/plugins/dali-swig/SWIG/pathConstrainer.i b/plugins/dali-swig/SWIG/pathConstrainer.i
deleted file mode 100644 (file)
index 90df543..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-%define PATHCONSTRAINER_PROPERTIES_HELPER(NameSpace, ClassName)
-%typemap(cscode) NameSpace::ClassName %{
-
-/* Properties earlier added by Ruby Script */
-
-  public Dali.CSharp.Position Forward
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( PathConstrainer.Property.FORWARD).Get(  temp );
-      Dali.CSharp.Position ret = new Dali.CSharp.Position(temp.x, temp.y, temp.z);
-      return ret;
-    }
-    set
-    {
-      SetProperty( PathConstrainer.Property.FORWARD, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Array Points
-  {
-    get
-    {
-      Dali.Property.Array temp = new Dali.Property.Array();
-      GetProperty( PathConstrainer.Property.POINTS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( PathConstrainer.Property.POINTS, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Array ControlPoints
-  {
-    get
-    {
-      Dali.Property.Array temp = new Dali.Property.Array();
-      GetProperty( PathConstrainer.Property.CONTROL_POINTS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( PathConstrainer.Property.CONTROL_POINTS, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
-%}
-%enddef
-
-namespace Dali
-{
-  PATHCONSTRAINER_PROPERTIES_HELPER(Dali, PathConstrainer);
-}
diff --git a/plugins/dali-swig/SWIG/progressBar.i b/plugins/dali-swig/SWIG/progressBar.i
deleted file mode 100644 (file)
index bbdb9bc..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-%define PROGRESSBAR_PROPERTIES_HELPER(NameSpace, ClassName)
-%typemap(cscode) NameSpace::ClassName %{
-
-/* Properties earlier added by Ruby Script */
-
-  public float ProgressValue
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ProgressBar.Property.PROGRESS_VALUE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ProgressBar.Property.PROGRESS_VALUE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map TrackVisual
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( ProgressBar.Property.TRACK_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ProgressBar.Property.TRACK_VISUAL, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map ProgressVisual
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( ProgressBar.Property.PROGRESS_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ProgressBar.Property.PROGRESS_VISUAL, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-
-%}
-%enddef
-
-namespace Dali
-{
-  PROGRESSBAR_PROPERTIES_HELPER(Dali::Toolkit, ProgressBar);
-}
diff --git a/plugins/dali-swig/SWIG/propertyValue.i b/plugins/dali-swig/SWIG/propertyValue.i
deleted file mode 100644 (file)
index bae68d4..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-%define PropertyValue_CONSTRUCTOR_HELPER(NameSpace, ClassName)
-%typemap(cscode) NameSpace::ClassName %{
-
-/* APIs to help use the high level classes Size, Position and Color */
-
-    public Value(Dali.CSharp.Size val): this(NDalicPINVOKE.new_Property_Value__SWIG_4(Vector2.getCPtr(new Vector2(val.W,val.H))), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-
-    public Value(Dali.CSharp.Position val) : this(NDalicPINVOKE.new_Property_Value__SWIG_5(Vector3.getCPtr(new Vector3(val.X,val.Y,val.Z))), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-
-    public Value(Dali.CSharp.Color val) : this(NDalicPINVOKE.new_Property_Value__SWIG_6(Vector4.getCPtr(new Vector4(val.R,val.G,val.B,val.A))), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-
-    public bool Get(Dali.CSharp.Size val) {
-      bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_5(swigCPtr, Vector2.getCPtr(new Vector2(val.W, val.H)));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-
-    public bool Get(Dali.CSharp.Position val) {
-      bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_6(swigCPtr, Vector3.getCPtr(new Vector3(val.X,val.Y,val.Z)));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-
-    public bool Get(Dali.CSharp.Color val) {
-      bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_7(swigCPtr, Vector4.getCPtr(new Vector4(val.R,val.G,val.B,val.A)));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-
-/* APIs end */
-
-%}
-%enddef
-
-namespace Dali
-{
-  PropertyValue_CONSTRUCTOR_HELPER(Dali::Property, Value);
-}
diff --git a/plugins/dali-swig/SWIG/pushButton.i b/plugins/dali-swig/SWIG/pushButton.i
deleted file mode 100644 (file)
index 5f437f8..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-%define PUSHBUTTON_PROPERTIES_HELPER(NameSpace, ClassName)
-%typemap(cscode) NameSpace::ClassName %{
-
-/* Properties earlier added by Ruby Script */
-
-  public string UnselectedIcon
-  {
-    get
-    {
-      string temp;
-      GetProperty( PushButton.Property.UNSELECTED_ICON).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( PushButton.Property.UNSELECTED_ICON, new Dali.Property.Value( value ) );
-    }
-  }
-  public string SelectedIcon
-  {
-    get
-    {
-      string temp;
-      GetProperty( PushButton.Property.SELECTED_ICON).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( PushButton.Property.SELECTED_ICON, new Dali.Property.Value( value ) );
-    }
-  }
-  public string IconAlignment
-  {
-    get
-    {
-      string temp;
-      GetProperty( PushButton.Property.ICON_ALIGNMENT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( PushButton.Property.ICON_ALIGNMENT, new Dali.Property.Value( value ) );
-    }
-  }
-  public string LabelPadding
-  {
-    get
-    {
-      string temp;
-      GetProperty( PushButton.Property.LABEL_PADDING).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( PushButton.Property.LABEL_PADDING, new Dali.Property.Value( value ) );
-    }
-  }
-  public string IconPadding
-  {
-    get
-    {
-      string temp;
-      GetProperty( PushButton.Property.ICON_PADDING).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( PushButton.Property.ICON_PADDING, new Dali.Property.Value( value ) );
-    }
-  }
-
-
-/* Properties ends */
-
-%}
-%enddef
-
-namespace Dali
-{
-  PUSHBUTTON_PROPERTIES_HELPER(Dali::Toolkit, PushButton);
-}
diff --git a/plugins/dali-swig/SWIG/renderer.i b/plugins/dali-swig/SWIG/renderer.i
deleted file mode 100644 (file)
index 1c408d2..0000000
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-%define Renderer_PROPERTIES_HELPER(NameSpace, ClassName)
-%typemap(cscode) NameSpace::ClassName %{
-
-/* Properties earlier added by Ruby Script */
-
-  public int DepthIndex
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.DEPTH_INDEX).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.DEPTH_INDEX, new Dali.Property.Value( value ) );
-    }
-  }
-  public int FaceCullingMode
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.FACE_CULLING_MODE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.FACE_CULLING_MODE, new Dali.Property.Value( value ) );
-    }
-  }
-  public int BlendMode
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.BLEND_MODE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.BLEND_MODE, new Dali.Property.Value( value ) );
-    }
-  }
-  public int BlendEquationRgb
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.BLEND_EQUATION_RGB).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.BLEND_EQUATION_RGB, new Dali.Property.Value( value ) );
-    }
-  }
-  public int BlendEquationAlpha
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.BLEND_EQUATION_ALPHA).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.BLEND_EQUATION_ALPHA, new Dali.Property.Value( value ) );
-    }
-  }
-  public int BlendFactorSrcRgb
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.BLEND_FACTOR_SRC_RGB).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.BLEND_FACTOR_SRC_RGB, new Dali.Property.Value( value ) );
-    }
-  }
-  public int BlendFactorDestRgb
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.BLEND_FACTOR_DEST_RGB).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.BLEND_FACTOR_DEST_RGB, new Dali.Property.Value( value ) );
-    }
-  }
-  public int BlendFactorSrcAlpha
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.BLEND_FACTOR_SRC_ALPHA).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.BLEND_FACTOR_SRC_ALPHA, new Dali.Property.Value( value ) );
-    }
-  }
-  public int BlendFactorDestAlpha
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.BLEND_FACTOR_DEST_ALPHA).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.BLEND_FACTOR_DEST_ALPHA, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color BlendColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Renderer.Property.BLEND_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.BLEND_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool BlendPreMultipliedAlpha
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Renderer.Property.BLEND_PRE_MULTIPLIED_ALPHA).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.BLEND_PRE_MULTIPLIED_ALPHA, new Dali.Property.Value( value ) );
-    }
-  }
-  public int IndexRangeFirst
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.INDEX_RANGE_FIRST).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.INDEX_RANGE_FIRST, new Dali.Property.Value( value ) );
-    }
-  }
-  public int IndexRangeCount
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.INDEX_RANGE_COUNT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.INDEX_RANGE_COUNT, new Dali.Property.Value( value ) );
-    }
-  }
-  public int DepthWriteMode
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.DEPTH_WRITE_MODE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.DEPTH_WRITE_MODE, new Dali.Property.Value( value ) );
-    }
-  }
-  public int DepthFunction
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.DEPTH_FUNCTION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.DEPTH_FUNCTION, new Dali.Property.Value( value ) );
-    }
-  }
-  public int DepthTestMode
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.DEPTH_TEST_MODE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.DEPTH_TEST_MODE, new Dali.Property.Value( value ) );
-    }
-  }
-  public int RenderMode
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.RENDER_MODE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.RENDER_MODE, new Dali.Property.Value( value ) );
-    }
-  }
-  public int StencilFunction
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.STENCIL_FUNCTION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.STENCIL_FUNCTION, new Dali.Property.Value( value ) );
-    }
-  }
-  public int StencilFunctionMask
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.STENCIL_FUNCTION_MASK).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.STENCIL_FUNCTION_MASK, new Dali.Property.Value( value ) );
-    }
-  }
-  public int StencilFunctionReference
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.STENCIL_FUNCTION_REFERENCE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.STENCIL_FUNCTION_REFERENCE, new Dali.Property.Value( value ) );
-    }
-  }
-  public int StencilMask
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.STENCIL_MASK).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.STENCIL_MASK, new Dali.Property.Value( value ) );
-    }
-  }
-  public int StencilOperationOnFail
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.STENCIL_OPERATION_ON_FAIL).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.STENCIL_OPERATION_ON_FAIL, new Dali.Property.Value( value ) );
-    }
-  }
-  public int StencilOperationOnZFail
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.STENCIL_OPERATION_ON_Z_FAIL).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.STENCIL_OPERATION_ON_Z_FAIL, new Dali.Property.Value( value ) );
-    }
-  }
-  public int StencilOperationOnZPass
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Renderer.Property.STENCIL_OPERATION_ON_Z_PASS).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.STENCIL_OPERATION_ON_Z_PASS, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool BatchingEnabled
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Renderer.Property.BATCHING_ENABLED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.BATCHING_ENABLED, new Dali.Property.Value( value ) );
-    }
-  }
-
-
-/* Properties ends */
-
-%}
-%enddef
-
-namespace Dali
-{
-  Renderer_PROPERTIES_HELPER(Dali, Renderer);
-}
diff --git a/plugins/dali-swig/SWIG/shader.i b/plugins/dali-swig/SWIG/shader.i
deleted file mode 100644 (file)
index b5b25f2..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-%define SHADER_PROPERTIES_HELPER(NameSpace, ClassName)
-%typemap(cscode) NameSpace::ClassName %{
-
-/* Properties earlier added by Ruby Script */
-
-  public Dali.Property.Map Program
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( Shader.Property.PROGRAM).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Shader.Property.PROGRAM, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-%}
-%enddef
-
-namespace Dali
-{
-  SHADER_PROPERTIES_HELPER(Dali, Shader);
-}
index 08c766b..e7aa444 100644 (file)
@@ -316,8 +316,7 @@ DALI_SIGNAL_1_PARAM( Dali::BaseHandle );
 DALI_SIGNAL_1_PARAM( const Dali::RefObject* );
 
 // Signal< void (const Dali::RenderTask&) >
-//DALI_SIGNAL_1_PARAM( const Dali::RenderTask& );
-DALI_SIGNAL_1_PARAM( Dali::RenderTask& );
+DALI_SIGNAL_1_PARAM( const Dali::RenderTask& );
 
 // Signal< bool ( const Dali::Toolkit::AccessibilityManager& ) >
 DALI_SIGNAL_1_PARAM_RETURN( bool, Dali::Toolkit::AccessibilityManager& );
diff --git a/plugins/dali-swig/SWIG/tableView.i b/plugins/dali-swig/SWIG/tableView.i
deleted file mode 100644 (file)
index 112b5b9..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-%define TableView_PROPERTIES_HELPER(NameSpace, ClassName)
-%typemap(cscode) NameSpace::ClassName %{
-
-/* Properties earlier added by Ruby Script */
-
-  public int Rows
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TableView.Property.ROWS).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TableView.Property.ROWS, new Dali.Property.Value( value ) );
-    }
-  }
-  public int Columns
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TableView.Property.COLUMNS).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TableView.Property.COLUMNS, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size CellPadding
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( TableView.Property.CELL_PADDING).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TableView.Property.CELL_PADDING, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map LayoutRows
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TableView.Property.LAYOUT_ROWS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TableView.Property.LAYOUT_ROWS, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map LayoutColumns
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TableView.Property.LAYOUT_COLUMNS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TableView.Property.LAYOUT_COLUMNS, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-%}
-%enddef
-
-namespace Dali
-{
-  TableView_PROPERTIES_HELPER(Dali::Toolkit, TableView);
-}
diff --git a/plugins/dali-swig/SWIG/textLabel.i b/plugins/dali-swig/SWIG/textLabel.i
deleted file mode 100644 (file)
index a93f5b3..0000000
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-%define TextLabel_PROPERTIES_HELPER(NameSpace, ClassName)
-%typemap(cscode) NameSpace::ClassName %{
-
-/* Properties earlier added by Ruby Script */
-
-  public int RenderingBackend
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TextLabel.Property.RENDERING_BACKEND).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.RENDERING_BACKEND, new Dali.Property.Value( value ) );
-    }
-  }
-  public string Text
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextLabel.Property.TEXT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.TEXT, new Dali.Property.Value( value ) );
-    }
-  }
-  public string FontFamily
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextLabel.Property.FONT_FAMILY).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.FONT_FAMILY, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map FontStyle
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextLabel.Property.FONT_STYLE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.FONT_STYLE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float PointSize
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextLabel.Property.POINT_SIZE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.POINT_SIZE, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool MultiLine
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( TextLabel.Property.MULTI_LINE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.MULTI_LINE, new Dali.Property.Value( value ) );
-    }
-  }
-  public string HorizontalAlignment
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextLabel.Property.HORIZONTAL_ALIGNMENT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.HORIZONTAL_ALIGNMENT, new Dali.Property.Value( value ) );
-    }
-  }
-  public string VerticalAlignment
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextLabel.Property.VERTICAL_ALIGNMENT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.VERTICAL_ALIGNMENT, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color TextColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextLabel.Property.TEXT_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.TEXT_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Size ShadowOffset
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( TextLabel.Property.SHADOW_OFFSET).Get(  temp );
-      Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.SHADOW_OFFSET, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color ShadowColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextLabel.Property.SHADOW_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.SHADOW_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool UnderlineEnabled
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( TextLabel.Property.UNDERLINE_ENABLED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.UNDERLINE_ENABLED, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.CSharp.Color UnderlineColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextLabel.Property.UNDERLINE_COLOR).Get(  temp );
-      Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a);
-      return ret;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.UNDERLINE_COLOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public float UnderlineHeight
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextLabel.Property.UNDERLINE_HEIGHT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.UNDERLINE_HEIGHT, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool EnableMarkup
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( TextLabel.Property.ENABLE_MARKUP).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.ENABLE_MARKUP, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool EnableAutoScroll
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( TextLabel.Property.ENABLE_AUTO_SCROLL).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.ENABLE_AUTO_SCROLL, new Dali.Property.Value( value ) );
-    }
-  }
-  public int AutoScrollSpeed
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TextLabel.Property.AUTO_SCROLL_SPEED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.AUTO_SCROLL_SPEED, new Dali.Property.Value( value ) );
-    }
-  }
-  public int AutoScrollLoopCount
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TextLabel.Property.AUTO_SCROLL_LOOP_COUNT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.AUTO_SCROLL_LOOP_COUNT, new Dali.Property.Value( value ) );
-    }
-  }
-  public float AutoScrollGap
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextLabel.Property.AUTO_SCROLL_GAP).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.AUTO_SCROLL_GAP, new Dali.Property.Value( value ) );
-    }
-  }
-  public float LineSpacing
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextLabel.Property.LINE_SPACING).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.LINE_SPACING, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map Underline
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextLabel.Property.UNDERLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.UNDERLINE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map Shadow
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextLabel.Property.SHADOW).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.SHADOW, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map Emboss
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextLabel.Property.EMBOSS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.EMBOSS, new Dali.Property.Value( value ) );
-    }
-  }
-  public Dali.Property.Map Outline
-  {
-    get
-    {
-      Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( TextLabel.Property.OUTLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.OUTLINE, new Dali.Property.Value( value ) );
-    }
-  }
-
-/* Properties ends */
-%}
-%enddef
-
-namespace Dali
-{
-  TextLabel_PROPERTIES_HELPER(Dali::Toolkit, TextLabel);
-}
index 795b917..d13b4ea 100644 (file)
@@ -18,7 +18,6 @@
 using System;
 using System.Runtime.InteropServices;
 using Dali;
-using Dali.CSharp;
 
 namespace MyCSharpExample
 {
@@ -31,7 +30,6 @@ namespace MyCSharpExample
 
     public Example(Dali.Application application)
     {
-      Console.WriteLine( "DBG : Example Constructor.... " );
       _application = application;
       Console.WriteLine( "InitSignal connection count = " + _application.InitSignal().GetConnectionCount() );
 
@@ -42,43 +40,37 @@ namespace MyCSharpExample
     public void Initialize(object source, AUIApplicationInitEventArgs e)
     {
 
-      Console.WriteLine( "DBG : Initializing.... " );
       OperatorTests();
 
       Handle handle = new Handle();
-      Console.WriteLine( "DBG : Initializing.... "+ handle );
       int myPropertyIndex = handle.RegisterProperty("myProperty", new Property.Value(10.0f), Property.AccessMode.READ_WRITE);
       float myProperty = 0.0f;
       handle.GetProperty(myPropertyIndex).Get(ref myProperty);
       Console.WriteLine( "myProperty value: " + myProperty );
 
-      Size s = new Size(5.0f, 5.0f);
-      Property.Value val = new Property.Value(s);
-      int myPropertyIndex2 = handle.RegisterProperty("myProperty2", val, Property.AccessMode.READ_WRITE);
+      int myPropertyIndex2 = handle.RegisterProperty("myProperty2", new Property.Value(new Size(5.0f, 5.0f)), Property.AccessMode.READ_WRITE);
       Size myProperty2 = new Size(0.0f, 0.0f);
       handle.GetProperty(myPropertyIndex2).Get(myProperty2);
-      Console.WriteLine( "myProperty2 value: " + myProperty2.W + ", " + myProperty2.H );
+      Console.WriteLine( "myProperty2 value: " + myProperty2.x + ", " + myProperty2.y );
 
       Actor actor = new Actor();
       actor.Size = new Position(200.0f, 200.0f, 0.0f);
       actor.Name = "MyActor";
-      actor.Color = new Color(Colors.Green);
+      actor.Color = new Color(1.0f, 0.0f, 1.0f, 0.8f);
       Console.WriteLine("Actor id: {0}", actor.GetId());
-      Console.WriteLine( "DBG : Initializing.... "+ actor.Size.X );
-
-      Console.WriteLine("Actor size: " + actor.Size.X + ", " + actor.Size.Y);
+      Console.WriteLine("Actor size: " + actor.Size.x + ", " + actor.Size.y);
       Console.WriteLine("Actor name: " + actor.Name);
 
       Stage stage = Stage.GetCurrent();
-      stage.BackgroundColor =  new Dali.CSharp.Color(Dali.CSharp.Colors.Blue) ;
+      stage.BackgroundColor =  new Color(Colors.White) ;
 
       Size stageSize = stage.Size;
-      Console.WriteLine("Stage size: " + stageSize.W + ", " + stageSize.H);
+      Console.WriteLine("Stage size: " + stageSize.x + ", " + stageSize.y);
       stage.Add(actor);
 
       TextLabel text = new TextLabel("Hello Mono World");
-      text.ParentOrigin = new Position(NDalic.ParentOriginCenter);
-      text.AnchorPoint = new Position(NDalic.AnchorPointCenter);
+      text.ParentOrigin = NDalic.ParentOriginCenter;
+      text.AnchorPoint = NDalic.AnchorPointCenter;
       text.HorizontalAlignment = "CENTER";
       stage.Add(text);
 
@@ -136,41 +128,41 @@ namespace MyCSharpExample
       Console.WriteLine( "    Area  = " + rd2.Area() );
 
       Console.WriteLine( " *************************" );
-      Size size = new Size(100, 50);
-      Console.WriteLine( "    Created " + size );
-      Console.WriteLine( "    Size width =  " + size.W + ", height = " + size.H );
-      size += new Size(20, 20);
-      Console.WriteLine( "    Size W =  " + size.W + ", H = " + size.H );
-      size.W += 10;
-      size.H += 10;
-      Console.WriteLine( "    Size width =  " + size.W + ", height = " + size.H );
-      size += new Size(15, 15);
-      Console.WriteLine( "    Size width =  " + size.W + ", height = " + size.H );
+      Size Size = new Size(100, 50);
+      Console.WriteLine( "    Created " + Size );
+      Console.WriteLine( "    Size x =  " + Size.x + ", y = " + Size.y );
+      Size += new Size(20, 20);
+      Console.WriteLine( "    Size x =  " + Size[0] + ", y = " + Size[1] );
+      Size.x += 10;
+      Size.y += 10;
+      Console.WriteLine( "    Size width =  " + Size.width + ", height = " + Size.height );
+      Size += new Size(15, 15);
+      Console.WriteLine( "    Size width =  " + Size[0] + ", height = " + Size[1] );
 
       Console.WriteLine( " *************************" );
-      Dali.CSharp.Position position = new Dali.CSharp.Position(20, 100, 50);
-      Console.WriteLine( "    Created " + position );
-      Console.WriteLine( "    Position x =  " + position.X + ", y = " + position.Y + ", z = " + position.Z );
-      position += new Dali.CSharp.Position(20, 20, 20);
-      Console.WriteLine( "    Position x =  " + position.X + ", y = " + position.Y + ", z = " + position.Y );
-      position.X += 10;
-      position.Y += 10;
-      position.Z += 10;
-      Console.WriteLine( "    Position width =  " + position.X + ", height = " + position.Y + ", depth = " + position.Z );
-      Dali.CSharp.Position parentOrigin = new Dali.CSharp.Position(NDalic.ParentOriginBottomRight);
-      Console.WriteLine( "    parentOrigin x =  " + parentOrigin.X + ", y = " + parentOrigin.Y + ", z = " + parentOrigin.Z );
+      Position Position = new Position(20, 100, 50);
+      Console.WriteLine( "    Created " + Position );
+      Console.WriteLine( "    Position x =  " + Position.x + ", y = " + Position.y + ", z = " + Position.z );
+      Position += new Position(20, 20, 20);
+      Console.WriteLine( "    Position x =  " + Position[0] + ", y = " + Position[1] + ", z = " + Position[2] );
+      Position.x += 10;
+      Position.y += 10;
+      Position.z += 10;
+      Console.WriteLine( "    Position width =  " + Position.width + ", height = " + Position.height + ", depth = " + Position.depth );
+      Position parentOrigin = new Dali.Position(NDalic.ParentOriginBottomRight);
+      Console.WriteLine( "    parentOrigin x =  " + parentOrigin.x + ", y = " + parentOrigin.y + ", z = " + parentOrigin.z );
 
       Console.WriteLine( " *************************" );
-      Dali.CSharp.Color color = new Dali.CSharp.Color(20, 100, 50, 200);
-      Console.WriteLine( "    Created " + color );
-      Console.WriteLine( "    Color x =  " + color.R + ", y = " + color.G + ", z = " + color.B + ", w = " + color.A );
-      color += new Dali.CSharp.Color(20, 20, 20, 20);
-      Console.WriteLine( "    Color x =  " + color.R + ", y = " + color.G + ", z = " + color.B + ", w = " + color.A );
-      color.R += 10;
-      color.G += 10;
-      color.B += 10;
-      color.A += 10;
-      Console.WriteLine( "    Color x =  " + color.R + ", y = " + color.G + ", z = " + color.B + ", w = " + color.A );
+      Color Color = new Color(20, 100, 50, 200);
+      Console.WriteLine( "    Created " + Color );
+      Console.WriteLine( "    Color x =  " + Color.x + ", y = " + Color.y + ", z = " + Color.z + ", w = " + Color.w );
+      Color += new Color(20, 20, 20, 20);
+      Console.WriteLine( "    Color x =  " + Color[0] + ", y = " + Color[1] + ", z = " + Color[2] + ", w = " + Color[3] );
+      Color.x += 10;
+      Color.y += 10;
+      Color.z += 10;
+      Color.w += 10;
+      Console.WriteLine( "    Color r =  " + Color.r + ", g = " + Color.g + ", b = " + Color.b + ", a = " + Color.a );
     }
 
 
index df298cc..7853ce3 100755 (executable)
@@ -18,7 +18,6 @@
 using System;
 using System.Runtime.InteropServices;
 using Dali;
-using Dali.CSharp;
 
 namespace MyCSharpExample
 {
@@ -39,14 +38,14 @@ namespace MyCSharpExample
         {
             Console.WriteLine("Customized Application Initialize event handler");
             Stage stage = Stage.GetCurrent();
-            stage.BackgroundColor = new Dali.CSharp.Color(Dali.CSharp.Colors.Red);
+            stage.BackgroundColor = new Color("white");
 
-            stage.Touched += OnStageTouched;
+           stage.Touched += OnStageTouched;
 
             // Add a _text label to the stage
             _text = new TextLabel("Hello Mono World");
-            _text.ParentOrigin = new Position(NDalic.ParentOriginCenter);
-            _text.AnchorPoint = new Position(NDalic.AnchorPointCenter);
+            _text.ParentOrigin = NDalic.ParentOriginCenter;
+            _text.AnchorPoint = NDalic.AnchorPointCenter;
             _text.HorizontalAlignment = "CENTER";
             _text.PointSize = 32.0f;
 
index 6fd08a3..342c82b 100644 (file)
@@ -18,7 +18,6 @@
 using System;
 using System.Runtime.InteropServices;
 using Dali;
-using Dali.CSharp;
 
 namespace MyCSharpExample
 {
@@ -51,14 +50,14 @@ namespace MyCSharpExample
     private void CreateScrollView()
     {
       Stage stage = Stage.GetCurrent();
-      stage.BackgroundColor = new Dali.CSharp.Color(Dali.CSharp.Colors.Green);
+      stage.BackgroundColor = new Color("white");
 
       // Create a scroll view
       _scrollView = new ScrollView();
       Size stageSize = stage.Size;
-      _scrollView.Size = new Position(stageSize.W, stageSize.H, 0.0f);
-      _scrollView.ParentOrigin = new Position(NDalic.ParentOriginCenter);
-      _scrollView.AnchorPoint = new Position(NDalic.AnchorPointCenter);
+      _scrollView.Size = new Position(stageSize.x, stageSize.y, 0.0f);
+      _scrollView.ParentOrigin = NDalic.ParentOriginCenter;
+      _scrollView.AnchorPoint = NDalic.AnchorPointCenter;
       stage.Add(_scrollView);
 
       // Add actors to a scroll view with 3 pages
@@ -70,15 +69,15 @@ namespace MyCSharpExample
         {
           View pageActor = new View();
           pageActor.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.ALL_DIMENSIONS);
-          pageActor.ParentOrigin = new Position(NDalic.ParentOriginCenter);
-          pageActor.AnchorPoint = new Position(NDalic.AnchorPointCenter);
-          pageActor.Position = new Position(pageColumn * stageSize.W, pageRow * stageSize.H, 0.0f);
+          pageActor.ParentOrigin = NDalic.ParentOriginCenter;
+          pageActor.AnchorPoint = NDalic.AnchorPointCenter;
+          pageActor.Position = new Position(pageColumn * stageSize.x, pageRow * stageSize.y, 0.0f);
 
           // Add images in a 3x4 grid layout for each page
           int imageRows = 4;
           int imageColumns = 3;
           float margin = 10.0f;
-          Position imageSize = new Position((stageSize.W / imageColumns) - margin, (stageSize.H / imageRows) - margin, 0.0f);
+          Position imageSize = new Position((stageSize.x / imageColumns) - margin, (stageSize.y / imageRows) - margin, 0.0f);
 
           for(int row = 0; row < imageRows; row++)
           {
@@ -86,11 +85,11 @@ namespace MyCSharpExample
             {
               int imageId = (row * imageColumns + column) % 2 + 1;
               ImageView imageView = new ImageView("images/image-" + imageId + ".jpg");
-              imageView.ParentOrigin = new Position(NDalic.ParentOriginCenter);
-              imageView.AnchorPoint = new Position(NDalic.AnchorPointCenter);
+              imageView.ParentOrigin = NDalic.ParentOriginCenter;
+              imageView.AnchorPoint = NDalic.AnchorPointCenter;
               imageView.Size = imageSize;
-              imageView.Position = new Position( margin * 0.5f + (imageSize.X + margin) * column - stageSize.W * 0.5f + imageSize.X * 0.5f,
-                  margin * 0.5f + (imageSize.Y + margin) * row - stageSize.H * 0.5f + imageSize.Y * 0.5f, 0.0f );
+              imageView.Position = new Position( margin * 0.5f + (imageSize.x + margin) * column - stageSize.x * 0.5f + imageSize.x * 0.5f,
+                  margin * 0.5f + (imageSize.y + margin) * row - stageSize.y * 0.5f + imageSize.y * 0.5f, 0.0f );
               pageActor.Add(imageView);
             }
           }
@@ -103,20 +102,20 @@ namespace MyCSharpExample
 
       // Set scroll view to have 3 pages in X axis and allow page snapping,
       // and also disable scrolling in Y axis.
-      RulerPtr scrollRulerX = new RulerPtr(new FixedRuler(stageSize.W));
+      RulerPtr scrollRulerX = new RulerPtr(new FixedRuler(stageSize.width));
       RulerPtr scrollRulerY = new RulerPtr(new DefaultRuler());
-      scrollRulerX.SetDomain(new RulerDomain(0.0f, stageSize.W * pageColumns, true));
+      scrollRulerX.SetDomain(new RulerDomain(0.0f, stageSize.width * pageColumns, true));
       scrollRulerY.Disable();
       _scrollView.SetRulerX(scrollRulerX);
       _scrollView.SetRulerY(scrollRulerY);
 
       // Create a horizontal scroll bar in the bottom of scroll view (which is optional)
       _scrollBar = new ScrollBar();
-      _scrollBar.ParentOrigin = new Position(NDalic.ParentOriginBottomLeft);
-      _scrollBar.AnchorPoint = new Position(NDalic.AnchorPointTopLeft);
+      _scrollBar.ParentOrigin = NDalic.ParentOriginBottomLeft;
+      _scrollBar.AnchorPoint = NDalic.AnchorPointTopLeft;
       _scrollBar.SetResizePolicy(ResizePolicyType.FIT_TO_CHILDREN, DimensionType.WIDTH);
       _scrollBar.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.HEIGHT);
-      _scrollBar.Orientation = new Quaternion( new Radian( new Degree( 270.0f ) ), Vector3.ZAXIS);
+      _scrollBar.Orientation = new Quaternion( new Radian( new Degree( 270.0f ) ), Position.ZAXIS );
       _scrollBar.SetScrollDirection(ScrollBar.Direction.Horizontal);
       _scrollView.Add(_scrollBar);
 
@@ -126,8 +125,8 @@ namespace MyCSharpExample
       _scrollView.WheelMoved += Onwheel;
       _scrollView.KeyInputFocusGained += OnKey;
       _text = new TextLabel("View Touch Event Handler Test");
-      _text.ParentOrigin = new Position(NDalic.ParentOriginCenter);
-      _text.AnchorPoint = new Position(NDalic.AnchorPointCenter);
+      _text.ParentOrigin = NDalic.ParentOriginCenter;
+      _text.AnchorPoint = NDalic.AnchorPointCenter;
       _text.HorizontalAlignment = "CENTER";
       _text.PointSize = 48.0f;
 
@@ -167,8 +166,8 @@ namespace MyCSharpExample
 
         _animation = new Animation(1.0f); // 1 second of duration
 
-        _animation.AnimateTo(new Property(_text, Actor.Property.ORIENTATION), new Property.Value(new Quaternion( new Radian( new Degree( 180.0f ) ), Vector3.XAXIS )), new AlphaFunction(AlphaFunction.BuiltinFunction.LINEAR), new TimePeriod(0.0f, 0.5f));
-        _animation.AnimateTo(new Property(_text, Actor.Property.ORIENTATION), new Property.Value(new Quaternion( new Radian( new Degree( 0.0f ) ), Vector3.XAXIS )), new AlphaFunction(AlphaFunction.BuiltinFunction.LINEAR), new TimePeriod(0.5f, 0.5f));
+        _animation.AnimateTo(new Property(_text, Actor.Property.ORIENTATION), new Property.Value(new Quaternion( new Radian( new Degree( 180.0f ) ), Position.XAXIS )), new AlphaFunction(AlphaFunction.BuiltinFunction.LINEAR), new TimePeriod(0.0f, 0.5f));
+        _animation.AnimateTo(new Property(_text, Actor.Property.ORIENTATION), new Property.Value(new Quaternion( new Radian( new Degree( 0.0f ) ), Position.XAXIS )), new AlphaFunction(AlphaFunction.BuiltinFunction.LINEAR), new TimePeriod(0.5f, 0.5f));
 
         // Connect the signal callback for animaiton finished signal
         _animation.Finished += AnimationFinished;
index 56112e7..3115a71 100644 (file)
 namespace Dali {
-  namespace CSharp {
 
-    using System;
+using System;
 
-    public enum Colors
-    {
-      Red,
-      White,
-      Blue,
-      Green,
-      Black,
-      Grey,
-      Yellow,
-      Azure,
-      Rose
-    }
 
-    public class Color
-    {
+public enum Colors
+{
+  Red,
+  White,
+  Blue,
+  Green,
+  Black,
+  Grey,
+  Yellow,
+  Azure,
+  Rose
+}
 
-      public float[] v;
 
-      /**
-       * @brief constructor
-       *
-       * @since 1.0.0
-       */
-      public Color()
-      {
-        v = new float[4];
-      }
 
-      /**
-       * @brief constructor
-       *
-       * @since 1.0.0
-       * @param [in] red The Color r.
-       * @param [in] green The Color g.
-       * @param [in] blue The Color b.
-       * @param [in] alpha The Color a.
-       */
-      public Color(float red, float green, float blue, float alpha):this()
-      {
-        v[0] = red;
-        v[1] = green;
-        v[2] = blue;
-        v[3] = alpha;
-      }
+public class Color : Vector4
+       {
+  /**
+   * @brief constructor
+   *
+   * @since 1.0.0
+   */
+           public Color()
+               : base()
+           { }
+  /**
+   * @brief constructor
+   *
+   * @since 1.0.0
+   * @param [in] red The Color r.
+   * @param [in] green The Color g.
+   * @param [in] blue The Color b.
+   * @param [in] alpha The Color a.
+   */
+           public Color(float red, float green, float blue, float alpha)
+               : base(red, green, blue, alpha)
+           { }
 
+  /**
+   * @brief constructor
+   *
+   * @since 1.0.0
+   * @param [in] o The Vector4 having r g b a components
+   */
+          public Color(Vector4 o)
+               : base(o.x, o.y, o.z, o.w)
+          {
+                 
+          }
 
-      /**
-       * @brief constructor
-       *
-       * @since 1.0.0
-       * @param [in] color as enum Colors.
-       */
-      public Color(Colors color)
-        : this(0, 0, 0, 0)
-      {
-        switch (color)
-        {
-          case Colors.Red:
-            SetColor(255, 0, 0, 255);
-            break;
-          case Colors.White:
-            SetColor(255, 255, 255, 255);
-            break;
-          case Colors.Blue:
-            SetColor(0, 0, 255, 255);
-            break;
-          case Colors.Green:
-            SetColor(0, 255, 0, 255);
-            break;
-          case Colors.Black:
-            SetColor(0, 0, 0, 255);
-            break;
-          case Colors.Grey:
-            SetColor(128, 128, 128, 255);
-            break;
-          case Colors.Yellow:
-            SetColor(255, 255, 0, 255);
-            break;
-          case Colors.Azure:
-            SetColor(0, 255, 255, 255);
-            break;
-          case Colors.Rose:
-            SetColor(255, 0, 255, 255);
-            break;
-        }
-      }
+  /**
+   * @brief constructor
+   *
+   * @since 1.0.0
+   * @param [in] color as string.
+   */
+           public Color(string color)
+               : base(0, 0, 0, 0)
+           {
+               switch (color)
+               {
+                   case "red":
+                       SetColor(255, 0, 0, 255);
+                       break;
+                   case "white":
+                       SetColor(255, 255, 255, 255);
+                       break;
+                   case "blue":
+                       SetColor(0, 0, 255, 255);
+                       break;
+                   case "green":
+                       SetColor(0, 255, 0, 255);
+                       break;
+                   case "black":
+                       SetColor(0, 0, 0, 255);
+                       break;
+                   case "grey":
+                       SetColor(128, 128, 128, 255);
+                       break;
+                   case "yellow":
+                       SetColor(255, 255, 0, 255);
+                       break;
+                   case "azure":
+                       SetColor(0, 255, 255, 255);
+                       break;
+                   case "rose":
+                       SetColor(255, 0, 255, 255);
+                       break;
+               }
+           }
 
 
+  /**
+   * @brief constructor
+   *
+   * @since 1.0.0
+   * @param [in] color as enum Colors.
+   */
+           public Color(Colors color)
+               : base(0, 0, 0, 0)
+           {
+               switch (color)
+               {
+                   case Colors.Red:
+                       SetColor(255, 0, 0, 255);
+                       break;
+                   case Colors.White:
+                       SetColor(255, 255, 255, 255);
+                       break;
+                   case Colors.Blue:
+                       SetColor(0, 0, 255, 255);
+                       break;
+                   case Colors.Green:
+                       SetColor(0, 255, 0, 255);
+                       break;
+                   case Colors.Black:
+                       SetColor(0, 0, 0, 255);
+                       break;
+                   case Colors.Grey:
+                       SetColor(128, 128, 128, 255);
+                       break;
+                   case Colors.Yellow:
+                       SetColor(255, 255, 0, 255);
+                       break;
+                   case Colors.Azure:
+                       SetColor(0, 255, 255, 255);
+                       break;
+                   case Colors.Rose:
+                       SetColor(255, 0, 255, 255);
+                       break;
+               }
+           }
 
-      /**
-       * @brief SetColor
-       *
-       * @since 1.0.0
-       * @param [in] red The Color r.
-       * @param [in] green The Color g.
-       * @param [in] blue The Color b.
-       * @param [in] alpha The Color a.
-       */
-      public void SetColor(float red, float green, float blue, float alpha)
-      {
-        R = red;
-        G = green;
-        B = blue;
-        A = alpha;
-      }
+   
+  /**
+   * @brief SetColor
+   *
+   * @since 1.0.0
+   * @param [in] red The Color r.
+   * @param [in] green The Color g.
+   * @param [in] blue The Color b.
+   * @param [in] alpha The Color a.
+   */
+           public void SetColor(float red, float green, float blue, float alpha)
+           { 
+               r = red;
+               g = green;
+               b = blue;
+               a = alpha;
+           }
 
       /**
        * @brief name "R", type float (Color's Red component)
        * @SINCE_1_0.0
        */
 
-      public float R
-      {
-        get { return v[0]; }
-        set { v[0] = value; }
-      }
+           public float R
+           {
+               get { return r; }
+               set { r = value; }
+           }
 
       /**
        * @brief name "G", type float (Color's Green component)
        * @SINCE_1_0.0
        */
-      public float G
-      {
-        get { return v[1]; }
-        set { v[1] = value; }
-      }
+           public float G
+           {
+               get { return g; }
+               set { g = value; }
+           }
 
       /**
        * @brief name "B", type float (Color's Blue component)
        * @SINCE_1_0.0
        */
-      public float B
-      {
-        get { return v[2]; }
-        set { v[2] = value; }
-      }
+           public float B
+           {
+               get { return b; }
+               set { b = value; }
+           }
 
       /**
        * @brief name "A", type float (Color's Alpha value)
        * @SINCE_1_0.0
        */
-      public float A
-      {
-        get { return v[3]; }
-        set { v[3] = value; }
-      }
+           public float A
+           {
+               get { return a; }
+               set { a = value; }
+           }
 
-      /**
-       * @brief operator+
-       *
-       * @since 1.0.0
-       * @param [in] l The Color to add.
-       * @param [in] r The Color to add
-       * @return A reference to this
-       */
-      public static Color operator +(Color l, Color r)
-      {
-        return new Color(l.R + r.R, l.G + r.G, l.B + r.B, l.A + r.A);
-      }
+  /**
+   * @brief operator+
+   *
+   * @since 1.0.0
+   * @param [in] l The Color to add.
+   * @param [in] r The Color to add
+   * @return A reference to this
+   */
+           public static Color operator +(Color l, Color r)
+           {
+               return new Color(l.R + r.R, l.G + r.G, l.B + r.B, l.A + r.A);
+           }
 
-      /**
-       * @brief operator-
-       *
-       * @since 1.0.0
-       * @param [in] l The Color to substract.
-       * @param [in] r The Color to substract
-       * @return A reference to this
-       */
-      public static Color operator -(Color l, Color r)
-      {
-        return new Color(l.R - r.R, l.G - r.G, l.B - r.B, l.A - r.A);
-      }
+  /**
+   * @brief operator-
+   *
+   * @since 1.0.0
+   * @param [in] l The Color to substract.
+   * @param [in] r The Color to substract
+   * @return A reference to this
+   */
+           public static Color operator -(Color l, Color r)
+           {
+               return new Color(l.R - r.R, l.G - r.G, l.B - r.B, l.A - r.A);
+           }
 
-      /**
-       * @brief operator*
-       *
-       * @since 1.0.0
-       * @param [in] a The Color to multiply.
-       * @param [in] b The Color to multiply
-       * @return A reference to this
-       */
-      public static Color operator *(Color a, double b)
-      {
-        return new Color((float)(a.R * b),(float)(a.G * b), (float)(a.B * b), (float)(a.A * b));
-      }
+  /**
+   * @brief operator*
+   *
+   * @since 1.0.0
+   * @param [in] a The Color to multiply.
+   * @param [in] b The Color to multiply
+   * @return A reference to this
+   */
+           public static Color operator *(Color a, double b)
+           {
+               return new Color((int)(a.R * b), (int)(a.G * b), (int)(a.B * b), (int)(a.A * b));
+           }
 
-      /**
-       * @brief operator/
-       *
-       * @since 1.0.0
-       * @param [in] a The Color to divide.
-       * @param [in] b The Color to divide
-       * @return float value of division operation
-       */
-      public static float operator /(Color a, Color b)
-      {
-        return (float)System.Math.Sqrt((a.R / b.R) * (a.G / b.G) * (a.B / b.B) * (a.A / b.A));
-      }
+  /**
+   * @brief operator/
+   *
+   * @since 1.0.0
+   * @param [in] a The Color to divide.
+   * @param [in] b The Color to divide
+   * @return float value of division operation
+   */
+           public static float operator /(Color a, Color b)
+           {
+               return (float)System.Math.Sqrt((a.R / b.R) * (a.G / b.G) * (a.B / b.B) * (a.A / b.A));
+           }
 
-      /**
-       * @brief Equals
-       *
-       * @since 1.0.0
-       * @param [in] o The Color object to compare.
-       * @param [in] r The Color to add
-       * @return bool, whether object equal or not
-       */
-      public override bool Equals(object obj)
-      {
-        Color l = this;
-        Color r = obj as Color;
-        if (r == null)
-        {
-          return false;
-        }
-        return l.R == r.R && l.G == r.G && l.B == r.B && l.A == r.A;
-      }
+  /**
+   * @brief Equals
+   *
+   * @since 1.0.0
+   * @param [in] o The Color object to compare.
+   * @param [in] r The Color to add
+   * @return bool, whether object equal or not
+   */
+           public override bool Equals(object obj)
+           {
+               Color l = this;
+               Color r = obj as Color;
+               if (r == null)
+               {
+                   return false;
+               }
+               return l.R == r.R && l.G == r.G && l.B == r.B && l.A == r.A;
+           }
 
-      /**
-       * @brief Clone
-       *
-       * @since 1.0.0
-       * @return Color object
-       */
-      public Color Clone()
-      {
-        Color copy = new Color(R, G, B, A);
-        return copy;
-      }
-    }
-  }
+  /**
+   * @brief GetHashCode
+   *
+   * @since 1.0.0
+   * @return int, hascode of Color
+   */
+           public override int GetHashCode()
+           {
+               return base.GetHashCode();
+           }
+
+  /**
+   * @brief Clone
+   *
+   * @since 1.0.0
+   * @return Color object
+   */
+           public Color Clone()
+           {
+               Color copy = new Color(R, G, B, A);
+               return copy;
+           }
+       }
 
 }
index b1cffe5..d56c414 100644 (file)
 namespace Dali {
-  namespace CSharp {
-    using System;
 
-    public class Position
-    {
-      public float[] v;
+using System;
 
-      /**
-       * @brief default constructor
-       *
-       * @since 1.0.0
-       */
-      public Position()
-      {
-        v = new float[3];
-      }
-
-      /**
-       * @brief constructor
-       *
-       * @since 1.0.0
-       * @param [in] a The Position X.
-       * @param [in] b The Position Y.
-       * @param [in] c The Position Z.
-       */
-      public Position(float a, float b, float c):this()
-      {
-        v[0] = a;
-        v[1] = b;
-        v[2] = c;
-      }
+public class Position : Vector3
+       {
 
-      /**
-       * @brief constructor
-       *
-       * @since 1.0.0
-       * @param [in] o The Vector Position X, Y, Z.
-       */
-      public Position(Vector3 o)
-        : this(o.x, o.y, o.z)
-      {
-      }
+  /**
+   * @brief constructor
+   *
+   * @since 1.0.0
+   */
+           public Position()
+               : base()
+           {
+           }
 
+  /**
+   * @brief constructor
+   *
+   * @since 1.0.0
+   * @param [in] a The Position X.
+   * @param [in] b The Position Y.
+   * @param [in] c The Position Z.
+   */
+           public Position(float a, float b, float c)
+               : base(a, b, c)
+           {
+           }
+           
+  /**
+   * @brief constructor
+   *
+   * @since 1.0.0
+   * @param [in] o The Vector Position X, Y, Z.
+   */
+           public Position(Vector3 o)
+               : base(o.x, o.y, o.z)
+           {      
+           }
 
-      ///< name "X", type float (Position X value)
-      //@since 1.0.0
-      public float X
-      {
-        get { return v[0]; }
-        set { v[0] = value; }
-      }
+  ///< name "X", type float (Position X value)
+  //@since 1.0.0
+           public float X
+           {
+               get { return width; }
+               set { width = value; }
+           }
 
-      ///< name "Y", type float (Position Y value)
-      //@since 1.0.0
-      public float Y
-      {
-        get { return v[1]; }
-        set { v[1] = value; }
-      }
+  ///< name "Y", type float (Position Y value)
+  //@since 1.0.0
+           public float Y
+           {
+               get { return height; }
+               set { height = value; }
+           }
 
-      ///< name "Z", type float (Position Z value)
-      //@since 1.0.0
-      public float Z
-      {
-        get { return v[2]; }
-        set { v[2] = value; }
-      }
+  ///< name "Z", type float (Position Z value)
+  //@since 1.0.0
+           public float Z
+           {
+               get { return depth; }
+               set { depth = value; }
+           }
+   
+  /**
+   * @brief operator+
+   *
+   * @since 1.0.0
+   * @param [in] l The Position to add.
+   * @param [in] r The Position to add
+   * @return A reference to this
+   */ 
+           public static Position operator +(Position l, Position r)
+           {
+               return new Position(l.X + r.X, l.Y + r.Y, l.Z + r.Z);
+           }
 
-      /**
-       * @brief operator+
-       *
-       * @since 1.0.0
-       * @param [in] l The Position to add.
-       * @param [in] r The Position to add
-       * @return A reference to this
-       */
-      public static Position operator +(Position l, Position r)
-      {
-        return new Position(l.X + r.X, l.Y + r.Y, l.Z + r.Z);
-      }
+  /**
+   * @brief operator-
+   *
+   * @since 1.0.0
+   * @param [in] l The Position to substract.
+   * @param [in] r The Position to substract
+   * @return A reference to this
+   */ 
+           public static Position operator -(Position l, Position r)
+           {
+               return new Position(l.X - r.X, l.Y - r.Y, l.Z - r.Z);
+           }
 
-      /**
-       * @brief operator-
-       *
-       * @since 1.0.0
-       * @param [in] l The Position to substract.
-       * @param [in] r The Position to substract
-       * @return A reference to this
-       */
-      public static Position operator -(Position l, Position r)
-      {
-        return new Position(l.X - r.X, l.Y - r.Y, l.Z - r.Z);
-      }
+  /**
+   * @brief operator*
+   *
+   * @since 1.0.0
+   * @param [in] a The Position to multiply.
+   * @param [in] b The Position to multiply
+   * @return A reference to this
+   */ 
+           public static Position operator *(Position a, double b)
+           {
+               return new Position((int)(a.X * b), (int)(a.Y * b), (int)(a.Z * b));
+           }
 
-      /**
-       * @brief operator*
-       *
-       * @since 1.0.0
-       * @param [in] a The Position to multiply.
-       * @param [in] b The Position to multiply
-       * @return A reference to this
-       */
-      public static Position operator *(Position a, double b)
-      {
-        return new Position((float)(a.X * b), (float)(a.Y * b), (float)(a.Z * b));
-      }
+  /**
+   * @brief operator/
+   *
+   * @since 1.0.0
+   * @param [in] a The Position to divide.
+   * @param [in] b The Position to divide
+   * @return float value of division operation
+   */ 
+           public static float operator /(Position a, Position b)
+           {
+               return (float)System.Math.Sqrt((a.X / b.X) * (a.Y / b.Y) * (a.Z / b.Z));
+           }
 
-      /**
-       * @brief operator/
-       *
-       * @since 1.0.0
-       * @param [in] a The Position to divide.
-       * @param [in] b The Position to divide
-       * @return float value of division operation
-       */
-      public static float operator /(Position a, Position b)
-      {
-        return (float)System.Math.Sqrt((a.X / b.X) * (a.Y / b.Y) * (a.Z / b.Z));
-      }
+  /**
+   * @brief Equals
+   *
+   * @since 1.0.0
+   * @param [in] o The Position object to compare.
+   * @return bool, whether object equal or not
+   */
+           public override bool Equals(object obj)
+           {
+               Position r = obj as Position;
+               if (r == null)
+               {
+                   return false;
+               }
+               return this.X == r.X && this.Y == r.Y && this.Z == r.Z;
+           }
 
-      /**
-       * @brief Equals
-       *
-       * @since 1.0.0
-       * @param [in] o The Position object to compare.
-       * @return bool, whether object equal or not
-       */
-      public override bool Equals(object obj)
-      {
-        Position r = obj as Position;
-        if (r == null)
-        {
-          return false;
-        }
-        return this.X == r.X && this.Y == r.Y && this.Z == r.Z;
-      }
+  /**
+   * @brief GetHashCode
+   *
+   * @since 1.0.0
+   * @return int, hascode of position
+   */
+           public override int GetHashCode()
+           {
+               return base.GetHashCode();
+           }
 
-      /**
-       * @brief Clone
-       *
-       * @since 1.0.0
-       * @return Position object
-       */
-      public Position Clone()
-      {
-        Position copy = new Position(X, Y, Z);
-        return copy;
+  /**
+   * @brief Clone
+   *
+   * @since 1.0.0
+   * @return Position object
+   */
+           public Position Clone()
+           {
+               Position copy = new Position(X, Y, Z);
+               return copy;
+           }
       }
-    }
-  }
 
 }
index f553d5d..07934ff 100644 (file)
 namespace Dali {
-  namespace CSharp {
-    using System;
 
-    public class Size {
-      public float[] v;
+using System;
 
-      /**
-       * @brief default constructor
-       *
-       * @since 1.0.0
-       */
-      public Size()
-      {
-        v = new float[2];
-      }
+public class Size : Vector2
+       {
 
-      /**
-       * @brief constructor
-       *
-       * @since 1.0.0
-       * @param [in] a Width value .
-       * @param [in] b Height value.
-       */
-      public Size(float a, float b):this()
-      {
-        v[0] = a;
-        v[1] = b;
-      }
+  /**
+   * @brief constructor
+   *
+   * @since 1.0.0
+   * @param [in] a Width value .
+   * @param [in] b Height value.
+   */
+          public Size(float a, float b)
+              : base(a, b)
+           {
+           }
+  /**
+   * @brief default constructor
+   *
+   * @since 1.0.0
+   */
+          public Size()
+              : base()
+           {
+           }   
 
-      /**
-       * @brief constructor with vector2 class object
-       *
-       * @since 1.0.0
-       * @param [in] o The Vector2 with Width, Height values.
-       */
-      public Size(Vector2 o)
-        : this(o.x, o.y)
-      {
-      }
+  /**
+   * @brief constructor with base class object
+   *
+   * @since 1.0.0
+   * @param [in] o The Vector2 with Width, Height values.
+   */
+          public Size(Vector2 o)
+               : base(o.x, o.y)
+          {
+                 
+          }
 
-      /**
-       * @brief Copy constructor
-       *
-       * @since 1.0.0
-       * @param [in] o The Size having Width & Y.
-       */
-      public Size(Size a)
-        : this(a.v[0], a.v[1])
-      {
-      }
+  /**
+   * @brief Copy constructor
+   *
+   * @since 1.0.0
+   * @param [in] o The Size having Width & Y.
+   */
+          public Size(Size a)
+              : base(a.width, a.height)
+           {
+           }
 
-      ///< name "W", type float (Size Width value)
-      //@since 1.0.0
-      public float W
-      {
-        get { return v[0]; }
-        set { v[0] = value; }
-      }
+  ///< name "W", type float (Size Width value)
+  //@since 1.0.0
+           public float W
+           {
+               get { return width; }
+               set { width = value; }
+           }
 
-      ///< name "H", type float (Size Height value)
-      //@since 1.0.0
-      public float H
-      {
-        get { return v[1]; }
-        set { v[1] = value; }
-      }
+  ///< name "H", type float (Size Height value)
+  //@since 1.0.0
+           public float H
+           {
+               get { return height; }
+               set { height = value; }
+           }
 
-      /**
-       * @brief operator+
-       *
-       * @since 1.0.0
-       * @param [in] l The Size to add.
-       * @param [in] r The Size to add
-       * @return A reference to this
-       */
-      public static Size operator +(Size l, Size r)
-      {
-        return new Size(l.W + r.W, l.H + r.H);
-      }
+  /**
+   * @brief operator+
+   *
+   * @since 1.0.0
+   * @param [in] l The Size to add.
+   * @param [in] r The Size to add
+   * @return A reference to this
+   */ 
+           public static Size operator +(Size l, Size r)
+           {
+               return new Size(l.W + r.W, l.H + r.H);
+           }
 
-      /**
-       * @brief operator-
-       *
-       * @since 1.0.0
-       * @param [in] l The Size to substract.
-       * @param [in] r The Size to substract
-       * @return A reference to this
-       */
-      public static Size operator -(Size l, Size r)
-      {
-        return new Size(l.W - r.W, l.H - r.H);
-      }
+  /**
+   * @brief operator-
+   *
+   * @since 1.0.0
+   * @param [in] l The Size to substract.
+   * @param [in] r The Size to substract
+   * @return A reference to this
+   */
+           public static Size operator -(Size l, Size r)
+           {
+               return new Size(l.W - r.W, l.H - r.H);
+           }
 
-      /**
-       * @brief operator*
-       *
-       * @since 1.0.0
-       * @param [in] a The Size to multiply
-       * @param [in] b The Size to multiply
-       * @return A reference to this
-       */
-      public static Size operator *(Size a, double b)
-      {
-        return new Size((float)(a.W * b), (float)(a.H * b));
-      }
+  /**
+   * @brief operator*
+   *
+   * @since 1.0.0
+   * @param [in] a The Size to multiply
+   * @param [in] b The Size to multiply
+   * @return A reference to this
+   */ 
+           public static Size operator *(Size a, double b)
+           {
+               return new Size((int)(a.W * b), (int)(a.H * b));
+           }
 
-      /**
-       * @brief operator/
-       *
-       * @since 1.0.0
-       * @param [in] a The Size to divide.
-       * @param [in] b The Size to divide
-       * @return float of the size division
-       */
-      public static float operator /(Size a, Size b)
-      {
-        return (float)System.Math.Sqrt((a.W / b.W) * (a.H / b.H));
-      }
+  /**
+   * @brief operator/
+   *
+   * @since 1.0.0
+   * @param [in] a The Size to divide.
+   * @param [in] b The Size to divide
+   * @return float of the size division
+   */
+           public static float operator /(Size a, Size b)
+           {
+               return (float)System.Math.Sqrt((a.W / b.W) * (a.H / b.H));
+           }
 
-      /**
-       * @brief Equals
-       *
-       * @since 1.0.0
-       * @param [in] obj The Size object to compare.
-       * @return bool, whether object equal or not
-       */
-      public override bool Equals(object obj)
-      {
-        Size that = obj as Size;
-        if (that == null)
-        {
-          return false;
-        }
-        return this.W == that.W && this.H == that.H;
-      }
+  /**
+   * @brief Equals
+   *
+   * @since 1.0.0
+   * @param [in] obj The Size object to compare.
+   * @return bool, whether object equal or not
+   */
+           public override bool Equals(object obj)
+           {
+               Size that = obj as Size;
+               if (that == null)
+               {
+                   return false;
+               }
+               return this.W == that.W && this.H == that.H;
+           }
 
+  /**
+   * @brief GetHashCode
+   *
+   * @since 1.0.0
+   * @return int, hascode of Size
+   */
+           public override int GetHashCode()
+           {
+               return (int)(W + H);
+           }
 
-      /**
-       * @brief Clone
-       *
-       * @since 1.0.0
-       * @return returns a copy of Size object
-       */
-      public Size Clone()
-      {
-        Size copy = new Size(W, H);
-        return copy;
-      }
-    }
-  }
+  /**
+   * @brief Clone
+   *
+   * @since 1.0.0
+   * @return returns a copy of Size object
+   */
+           public Size Clone()
+           {
+               Size copy = new Size(W, H);
+               return copy;
+           }
+       }
 }