C# binding for Direction and Align enums 15/115615/2
authorRichard Huang <r.huang@samsung.com>
Mon, 20 Feb 2017 15:57:19 +0000 (15:57 +0000)
committerRichard Huang <r.huang@samsung.com>
Tue, 21 Feb 2017 10:20:10 +0000 (10:20 +0000)
Change-Id: I474c8e5e6beae1e51248430cc4a99fb7b24a4891

plugins/dali-swig/SWIG/dali-toolkit.i
plugins/dali-swig/manual/csharp/DaliEnumConstants.cs

index 946a250..d70cc93 100755 (executable)
 %rename(ExceedPolicyType) Dali::Toolkit::TextField::ExceedPolicy;
 %rename(ToolkitPropertyRange) Dali::Toolkit::PropertyRanges;
 %rename(TooltipPositionType) Dali::Toolkit::Tooltip::Position::Type;
+%rename(DirectionType) Dali::Toolkit::Direction::Type;
+%rename(AlignType) Dali::Toolkit::Align::Type;
 %rename(VisualType) Dali::Toolkit::Visual::Type;
 %rename(VisualTransformPropertyType) Dali::Toolkit::DevelVisual::Transform::Property::Type;
 %rename(VISUAL_SHADER_VERTEX) Dali::Toolkit::Visual::Shader::Property::VERTEX_SHADER;
 %csconstvalue("1 << 5") REQUIRES_KEYBOARD_NAVIGATION_SUPPORT;
 %csconstvalue("1 << 6") DISABLE_STYLE_CHANGE_SIGNALS;
 
+%typemap(csclassmodifiers) Dali::Toolkit::Alignment "internal class"
+
 typedef unsigned int ItemId;
 typedef std::vector<ItemId> ItemIdContainer;
 typedef std::pair<ItemId, Actor> Item;
@@ -285,6 +289,8 @@ typedef Dali::IntrusivePtr<Dali::Toolkit::Ruler> RulerPtr;
 %include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h>
 %include <dali-toolkit/devel-api/controls/buttons/toggle-button.h>
 
+%include <dali-toolkit/devel-api/align-enums.h>
+
 %include <dali-toolkit/devel-api/visual-factory/visual-base.h>
 %include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 
index 4b5d1f5..885070c 100755 (executable)
@@ -19,7 +19,6 @@ namespace Dali
 {
   namespace Constants
   {
-
     public enum TextureType
     {
       Texture2D     = Dali.TextureType.TEXTURE_2D,   ///< One 2D image                            @SINCE_1_1.43
@@ -95,6 +94,31 @@ namespace Dali
       public static readonly Dali.Vector3 Zero = Dali.Vector3.ZERO;
     }
 
+    public struct Direction
+    {
+      public enum Type
+      {
+        LeftToRight = Dali.DirectionType.LEFT_TO_RIGHT,
+        RightToLeft = Dali.DirectionType.RIGHT_TO_LEFT
+      }
+    }
+
+    public struct Align
+    {
+      public enum Type
+      {
+        TopBegin = Dali.AlignType.TOP_BEGIN,
+        TopCenter = Dali.AlignType.TOP_CENTER,
+        TopEnd = Dali.AlignType.TOP_END,
+        CenterBegin = Dali.AlignType.CENTER_BEGIN,
+        Center = Dali.AlignType.CENTER,
+        CenterEnd = Dali.AlignType.CENTER_END,
+        BottomBegin = Dali.AlignType.BOTTOM_BEGIN,
+        BottomCenter = Dali.AlignType.BOTTOM_CENTER,
+        BottomEnd = Dali.AlignType.BOTTOM_END
+      }
+    }
+
     public struct Visual
     {
       public enum Type
@@ -115,7 +139,7 @@ namespace Dali
         public static readonly int Shader = NDalic.VISUAL_PROPERTY_SHADER;
         public static readonly int Transform = NDalic.VISUAL_PROPERTY_TRANSFORM;
         public static readonly int PremultipliedAlpha = NDalic.VISUAL_PROPERTY_PREMULTIPLIED_ALPHA;
-        public static readonly int MixCOlor = NDalic.VISUAL_PROPERTY_MIX_COLOR;
+        public static readonly int MixColor = NDalic.VISUAL_PROPERTY_MIX_COLOR;
       }
 
       public struct ShaderProperty
@@ -234,6 +258,5 @@ namespace Dali
         public static readonly int BelowVisual = NDalic.TOOLTIP_TAIL_BELOW_VISUAL;
       }
     }
-
   } // namespace Constants
 } // namesapce Dali