From 6f754cc282c79e49512bd4bd5b72e2b08f62ba5f Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Mon, 20 Feb 2017 15:57:19 +0000 Subject: [PATCH] C# binding for Direction and Align enums Change-Id: I474c8e5e6beae1e51248430cc4a99fb7b24a4891 --- plugins/dali-swig/SWIG/dali-toolkit.i | 6 +++++ .../dali-swig/manual/csharp/DaliEnumConstants.cs | 29 +++++++++++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/plugins/dali-swig/SWIG/dali-toolkit.i b/plugins/dali-swig/SWIG/dali-toolkit.i index 946a250..d70cc93 100755 --- a/plugins/dali-swig/SWIG/dali-toolkit.i +++ b/plugins/dali-swig/SWIG/dali-toolkit.i @@ -118,6 +118,8 @@ %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; @@ -216,6 +218,8 @@ %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 ItemIdContainer; typedef std::pair Item; @@ -285,6 +289,8 @@ typedef Dali::IntrusivePtr RulerPtr; %include %include +%include + %include %include diff --git a/plugins/dali-swig/manual/csharp/DaliEnumConstants.cs b/plugins/dali-swig/manual/csharp/DaliEnumConstants.cs index 4b5d1f5..885070c 100755 --- a/plugins/dali-swig/manual/csharp/DaliEnumConstants.cs +++ b/plugins/dali-swig/manual/csharp/DaliEnumConstants.cs @@ -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 -- 2.7.4