From: dongsug song Date: Fri, 14 Apr 2017 03:22:28 +0000 (-0700) Subject: Merge "[NUI-252] change string type of property to enum type of property" into tizen X-Git-Tag: submit/trunk/20170823.075128~91^2~216 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c0a1a15157bd1fb728f3c268bbad972fd411b87;hp=f522e5456f5d27148b7ef063eb012073f8bd2870;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git Merge "[NUI-252] change string type of property to enum type of property" into tizen --- diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj index 67910c0..2a5ec29 100755 --- a/src/Tizen.NUI/Tizen.NUI.csproj +++ b/src/Tizen.NUI/Tizen.NUI.csproj @@ -328,6 +328,9 @@ + + + diff --git a/src/Tizen.NUI/src/internal/Application.cs b/src/Tizen.NUI/src/internal/Application.cs index 5952e6a..259cbdd 100755 --- a/src/Tizen.NUI/src/internal/Application.cs +++ b/src/Tizen.NUI/src/internal/Application.cs @@ -1052,10 +1052,10 @@ namespace Tizen.NUI internal void SetupDelegates() { InitDelegateInternal initializeCallback = new InitDelegateInternal(Initialize); - System.Console.WriteLine("InitSignal connection count"); + Tizen.Log.Debug("NUI", "InitSignal connection count"); this.InitSignal().Connect(initializeCallback); - //Console.WriteLine( "InitSignal connection count = " + app.InitSignal().GetConnectionCount() ); + //Tizen.Log.Debug("NUI", "InitSignal connection count = " + app.InitSignal().GetConnectionCount() ); } public static Application NewApplication() diff --git a/src/Tizen.NUI/src/internal/PropertyRangeManager.cs b/src/Tizen.NUI/src/internal/PropertyRangeManager.cs index e4fcf4a..c342605 100755 --- a/src/Tizen.NUI/src/internal/PropertyRangeManager.cs +++ b/src/Tizen.NUI/src/internal/PropertyRangeManager.cs @@ -103,7 +103,7 @@ namespace Tizen.NUI startEventPropertyIndex += (int)Tizen.NUI.PropertyRanges.DEFAULT_PROPERTY_MAX_COUNT_PER_DERIVATION; // DALi uses 10,000 startAnimatablePropertyIndex += maxCountPerDerivation; - //Console.WriteLine ("getStartPropertyIndex = " + viewType.Name +"current index " + startEventPropertyIndex); + //Tizen.Log.Debug("NUI", "getStartPropertyIndex = " + viewType.Name +"current index " + startEventPropertyIndex); #if (DOT_NET_CORE) viewType = viewType.GetTypeInfo().BaseType; #else diff --git a/src/Tizen.NUI/src/internal/ViewRegistry.cs b/src/Tizen.NUI/src/internal/ViewRegistry.cs index a1bf0cd..94a6c43 100755 --- a/src/Tizen.NUI/src/internal/ViewRegistry.cs +++ b/src/Tizen.NUI/src/internal/ViewRegistry.cs @@ -194,12 +194,12 @@ namespace Tizen.NUI Tizen.NUI.PropertyType daliType; if (_daliPropertyTypeLookup.TryGetValue(cSharpTypeName, out daliType)) { - //Console.WriteLine("mapped "+ cSharpTypeName + " to dAli type " +daliType ); + //Tizen.Log.Debug("NUI", "mapped "+ cSharpTypeName + " to dAli type " +daliType ); return daliType; } else { - // Console.WriteLine("Failed to find a mapping between C# property" + cSharpTypeName +" and DALi type"); + // Tizen.Log.Debug("NUI", "Failed to find a mapping between C# property" + cSharpTypeName +" and DALi type"); return PropertyType.None; } } @@ -212,7 +212,7 @@ namespace Tizen.NUI private static IntPtr CreateControl(IntPtr cPtrControlName) { string controlName = System.Runtime.InteropServices.Marshal.PtrToStringAnsi(cPtrControlName); - // Console.WriteLine ("Create controlled called from C++ create a " + controlName); + // Tizen.Log.Debug("NUI", "Create controlled called from C++ create a " + controlName); Func controlConstructor; @@ -240,7 +240,7 @@ namespace Tizen.NUI RefObject refObj = view.GetObjectPtr(); IntPtr refCptr = (IntPtr)RefObject.getCPtr(refObj); - //Console.WriteLine ("________Storing ref object cptr in control map Hex: {0:X}", refCptr); + //Tizen.Log.Debug("NUI", "________Storing ref object cptr in control map Hex: {0:X}", refCptr); if (!Instance._controlMap.ContainsKey(refCptr)) { Instance._controlMap.Add(refCptr, new WeakReference(view, false)); @@ -275,7 +275,7 @@ namespace Tizen.NUI private static void SetProperty(IntPtr controlPtr, IntPtr propertyName, IntPtr propertyValue) { string name = System.Runtime.InteropServices.Marshal.PtrToStringAnsi(propertyName); - //Console.WriteLine ( SetControlProperty called for:" + name ); + //Tizen.Log.Debug("NUI", SetControlProperty called for:" + name ); Instance.SetPropertyValue(controlPtr, name, propertyValue); } @@ -355,7 +355,7 @@ namespace Tizen.NUI // If the Scriptable attribute exists, then register it with the type registry. if (attr is ScriptableProperty) { - //Console.WriteLine ("Got a DALi JSON scriptable property = " + propertyInfo.Name +", of type " + propertyInfo.PropertyType.Name); + //Tizen.Log.Debug("NUI", "Got a DALi JSON scriptable property = " + propertyInfo.Name +", of type " + propertyInfo.PropertyType.Name); // first get the attribute type, ( default, or animatable) ScriptableProperty scriptableProp = attr as ScriptableProperty; @@ -371,7 +371,7 @@ namespace Tizen.NUI TypeRegistration.RegisterProperty(viewType.Name, propertyInfo.Name, propertyIndex, propertyType, _setPropertyCallback, _getPropertyCallback); } } - // Console.WriteLine ("property name = " + propertyInfo.Name); + // Tizen.Log.Debug("NUI", "property name = " + propertyInfo.Name); } } } @@ -415,7 +415,7 @@ namespace Tizen.NUI { // Get the C# control that maps to the C++ control - //Console.WriteLine ("SetPropertyValue refObjectPtr = {0:X}", controlPtr); + //Tizen.Log.Debug("NUI", "SetPropertyValue refObjectPtr = {0:X}", controlPtr); PropertyValue propValue = new PropertyValue(propertyValuePtr, false); diff --git a/src/Tizen.NUI/src/public/Actor.cs b/src/Tizen.NUI/src/public/Actor.cs index c93e093..e58dd58 100755 --- a/src/Tizen.NUI/src/public/Actor.cs +++ b/src/Tizen.NUI/src/public/Actor.cs @@ -86,7 +86,7 @@ namespace Tizen.NUI } /// - /// Retrieve the position of the Actor.
+ /// Retrieves the position of the Actor.
/// The coordinates are relative to the Actor's parent.
/// public Position CurrentPosition @@ -98,7 +98,7 @@ namespace Tizen.NUI } /// - /// Retrieve the size of the Actor.
+ /// Retrieves the size of the Actor.
/// The coordinates are relative to the Actor's parent.
/// public Size CurrentSize @@ -151,11 +151,12 @@ namespace Tizen.NUI } /// - /// Determines whether the anchor point should be used to determine the position of the actor.
- /// This is true by default.
- /// Note: If false, then the top-left of the actor is used for the position.
- /// Setting this to false will allow scaling or rotation around the anchor-point without affecting the actor's position.
+ /// Determines whether the anchor point should be used to determine the position of the actor. + /// This is true by default. /// + /// If false, then the top-left of the actor is used for the position. + /// Setting this to false will allow scaling or rotation around the anchor-point without affecting the actor's position. + /// protected bool PositionUsesAnchorPoint { get @@ -194,11 +195,13 @@ namespace Tizen.NUI } /// - /// Sets the sibling order of the actor so depth position can be defined within the same parent.
- /// Note The initial value is 0.
- /// Raise, Lower, RaiseToTop, LowerToBottom, RaiseAbove and LowerBelow will override the sibling order.
- /// The values set by this Property will likely change.
+ /// Sets the sibling order of the actor so depth position can be defined within the same parent. /// + /// + /// Note The initial value is 0. + /// Raise, Lower, RaiseToTop, LowerToBottom, RaiseAbove and LowerBelow will override the sibling order. + /// The values set by this Property will likely change. + /// public int SiblingOrder { get @@ -214,10 +217,10 @@ namespace Tizen.NUI } /// - /// Sets the size of an actor for Width and Height.
+ /// Sets the size of an actor for width and height.
/// Geometry can be scaled to fit within this area.
/// This does not interfere with the actors scale factor.
- /// The actors default depth is the minimum of Width & Height.
+ /// The actors default depth is the minimum of width & height.
/// public Size2D Size2D { @@ -253,31 +256,38 @@ namespace Tizen.NUI } /// - /// Sets the visibility flag of an actor as true to be shown.
- /// Note This is an asynchronous method; the value written may not match a value subsequently read with Visible.
- /// If an actor's visibility flag is set to false, then the actor and its children will not be rendered.
- /// This is regardless of the individual visibility values of the children i.e.an actor will only be rendered if all of its parents have visibility set to true.
+ /// Shows the Actor. /// + /// + /// This is an asynchronous method. + /// public void Show() { SetVisible(true); } /// - /// Sets the visibility flag of an actor as false to be hidden. + /// Hides the Actor. /// + /// + /// This is an asynchronous method. + /// If an actor is hidden, then the actor and its children will not be rendered. + /// This is regardless of the individual visibility of the children i.e.an actor will only be rendered if all of its parents are shown. + /// public void Hide() { SetVisible(false); } /// - /// Raise actor above the next highest level of actor(s).
- /// Note Sibling order of actors within the parent will be updated automatically.
- /// Initially actors added to a parent will have the same sibling order and shown in relation to insertion order.
- /// Raising this actor above actors with the same sibling order as each other will raise this actor above them.
- /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion.
+ /// Raise actor above the next highest level of actor(s). /// + /// + /// Sibling order of actors within the parent will be updated automatically. + /// Initially actors added to a parent will have the same sibling order and shown in relation to insertion order. + /// Raising this actor above actors with the same sibling order as each other will raise this actor above them. + /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion. + /// public void Raise() { NDalicPINVOKE.Raise(swigCPtr); @@ -285,11 +295,13 @@ namespace Tizen.NUI } /// - /// Lower the actor to underneath the level below actor(s).
- /// Note Sibling order of actors within the parent will be updated automatically.
- /// Lowering this actor below actors with the same sibling order as each other will lower this actor above them.
- /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion.
+ /// Lower the actor to underneath the level below actor(s). /// + /// + /// Sibling order of actors within the parent will be updated automatically. + /// Lowering this actor below actors with the same sibling order as each other will lower this actor above them. + /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion. + /// public void Lower() { NDalicPINVOKE.Lower(swigCPtr); @@ -297,10 +309,12 @@ namespace Tizen.NUI } /// - /// Raise actor above all other actors.
- /// Note Sibling order of actors within the parent will be updated automatically.
- /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion.
+ /// Raise actor above all other actors. /// + /// + /// Sibling order of actors within the parent will be updated automatically. + /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion. + /// public void RaiseToTop() { NDalicPINVOKE.RaiseToTop(swigCPtr); @@ -308,10 +322,12 @@ namespace Tizen.NUI } /// - /// Lower actor to the bottom of all actors.
- /// Note Sibling order of actors within the parent will be updated automatically.
- /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion.
+ /// Lower actor to the bottom of all actors. /// + /// + /// Sibling order of actors within the parent will be updated automatically. + /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion. + /// public void LowerToBottom() { NDalicPINVOKE.LowerToBottom(swigCPtr); @@ -319,12 +335,13 @@ namespace Tizen.NUI } /// - /// Raise the actor to above the target actor.
- /// Note Sibling order of actors within the parent will be updated automatically.
- /// Actors on the level above the target actor will still be shown above this actor.
- /// Raising this actor above actors with the same sibling order as each other will raise this actor above them.
- /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion.
+ /// Raise the actor to above the target actor. /// + /// Sibling order of actors within the parent will be updated automatically. + /// Actors on the level above the target actor will still be shown above this actor. + /// Raising this actor above actors with the same sibling order as each other will raise this actor above them. + /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion. + /// /// Will be raised above this actor public void RaiseAbove(Actor target) { @@ -333,11 +350,12 @@ namespace Tizen.NUI } /// - /// Lower the actor to below the target actor.
- /// Note Sibling order of actors within the parent will be updated automatically.
- /// Lowering this actor below actors with the same sibling order as each other will lower this actor above them.
- /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion.
+ /// Lower the actor to below the target actor. /// + /// Sibling order of actors within the parent will be updated automatically. + /// Lowering this actor below actors with the same sibling order as each other will lower this actor above them. + /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion. + /// /// Will be lowered below this actor public void LowerBelow(Actor target) { @@ -466,7 +484,7 @@ namespace Tizen.NUI /// If not, the returned handle is left uninitialized.
/// /// handle to An object - /// handle to a Actor object or an uninitialized handle + /// handle to an Actor object or an uninitialized handle public new static Actor DownCast(BaseHandle handle) { Actor ret = new Actor(NDalicPINVOKE.Actor_DownCast(BaseHandle.getCPtr(handle)), true); @@ -535,11 +553,11 @@ namespace Tizen.NUI } /// - /// Adds a child Actor to this Actor.
- /// Precondition : This Actor(the parent) has been initialized. The child actor has been initialized. The child actor is not the same as the parent actor.
- /// PostCondition : The child will be referenced by its parent. This means that the child will be kept alive, even if the handle passed into this method is reset or destroyed.
- /// Note : If the child already has a parent, it will be removed from old parent and reparented to this actor. This may change child's position, color, scale etc as it now inherits them from this actor.
+ /// Adds a child Actor to this Actor. /// + /// 
This Actor(the parent) has been initialized. The child actor has been initialized. The child actor is not the same as the parent actor.
+ /// The child will be referenced by its parent. This means that the child will be kept alive, even if the handle passed into this method is reset or destroyed. + /// If the child already has a parent, it will be removed from old parent and reparented to this actor. This may change child's position, color, scale etc as it now inherits them from this actor. /// The child public void Add(Actor child) { @@ -548,9 +566,9 @@ namespace Tizen.NUI } /// - /// Removes a child Actor from this Actor. If the actor was not a child of this actor, this is a no-op.
- /// Precondition : This Actor(the parent) has been initialized. The child actor is not the same as the parent actor.
+ /// Removes a child Actor from this Actor. If the actor was not a child of this actor, this is a no-op. /// + /// 
This Actor(the parent) has been initialized. The child actor is not the same as the parent actor.
/// The child public void Remove(Actor child) { @@ -565,9 +583,9 @@ namespace Tizen.NUI } /// - /// Retrieves the number of children held by the actor.
- /// Precondition : The Actor has been initialized.
+ /// Retrieves the number of children held by the actor. /// + /// 
The Actor has been initialized.
/// The number of children public uint GetChildCount() { @@ -577,9 +595,9 @@ namespace Tizen.NUI } /// - /// Retrieve and child actor by index.
- /// Precondition : The Actor has been initialized.
+ /// Retrieves child actor by index. /// + /// 
The Actor has been initialized.
/// The index of the child to retrieve /// The actor for the given index or empty handle if children not initialized public Actor GetChildAt(uint index) @@ -590,10 +608,10 @@ namespace Tizen.NUI } /// - /// Search through this actor's hierarchy for an actor with the given name.
- /// The actor itself is also considered in the search.
- ///Precondition : The Actor has been initialized.
+ /// Search through this actor's hierarchy for an actor with the given name. + /// The actor itself is also considered in the search. /// + /// 
The Actor has been initialized.
/// The name of the actor to find /// A handle to the actor if found, or an empty handle if not public Actor FindChildByName(string actorName) @@ -976,10 +994,10 @@ namespace Tizen.NUI } /// - /// Converts screen coordinates into the actor's coordinate system using the default camera.
- /// Precondition : The Actor has been initialized.
- /// Note : The actor coordinates are relative to the top-left(0.0, 0.0, 0.5).
+ /// Converts screen coordinates into the actor's coordinate system using the default camera. /// + /// 
The Actor has been initialized.
+ /// The actor coordinates are relative to the top-left(0.0, 0.0, 0.5) /// On return, the X-coordinate relative to the actor /// On return, the Y-coordinate relative to the actor /// The screen X-coordinate @@ -1046,10 +1064,11 @@ namespace Tizen.NUI /// /// Sets the relative to parent size factor of the actor.
- /// This factor is only used when ResizePolicy is set to either.
+ /// This factor is only used when ResizePolicy is set to either: + /// ResizePolicy::SIZE_RELATIVE_TO_PARENT or ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT.
/// This actor's size is set to the actor's size multiplied by or added to this factor, depending on ResizePolicy.
- /// Precondition : The Actor has been initialized.
/// + /// 
The Actor has been initialized.
/// A Vector3 representing the relative factor to be applied to each axis public void SetSizeModeFactor(Vector3 factor) { @@ -1070,7 +1089,7 @@ namespace Tizen.NUI /// size 0 is treated as aspect ratio 1:1.
/// /// Width to use - /// the height based on the width + /// The height based on the width public float GetHeightForWidth(float width) { float ret = NDalicPINVOKE.Actor_GetHeightForWidth(swigCPtr, width); @@ -1084,7 +1103,7 @@ namespace Tizen.NUI /// size 0 is treated as aspect ratio 1:1.
/// /// Height to use - /// the width based on the height + /// The width based on the height public float GetWidthForHeight(float height) { float ret = NDalicPINVOKE.Actor_GetWidthForHeight(swigCPtr, height); @@ -1102,7 +1121,7 @@ namespace Tizen.NUI /// /// Sets the padding for use in layout.
/// - /// padding Padding for the actor + /// Padding for the actor public void SetPadding(PaddingType padding) { NDalicPINVOKE.Actor_SetPadding(swigCPtr, PaddingType.getCPtr(padding)); @@ -1236,11 +1255,11 @@ namespace Tizen.NUI /// /// Gets/Sets the origin of an actor, within its parent's area.
- /// This is expressed in unit coordinates, such that(0.0, 0.0, 0.5) is the top-left corner of the parent, and(1.0, 1.0, 0.5) is the bottom-right corner.
+ /// This is expressed in unit coordinates, such that (0.0, 0.0, 0.5) is the top-left corner of the parent, and(1.0, 1.0, 0.5) is the bottom-right corner.
/// The default parent-origin is ParentOrigin.TopLeft (0.0, 0.0, 0.5).
/// An actor's position is the distance between this origin, and the actor's anchor-point.
- /// Precondition : The Actor has been initialized.
/// + /// 
The Actor has been initialized.
public Position ParentOrigin { get @@ -1257,11 +1276,11 @@ namespace Tizen.NUI /// /// Gets/Sets the anchor-point of an actor.
- /// This is expressed in unit coordinates, such that (0.0, 0.0, 0.5) is the top-left corner of the actor, and(1.0, 1.0, 0.5) is the bottom-right corner.
+ /// This is expressed in unit coordinates, such that (0.0, 0.0, 0.5) is the top-left corner of the actor, and (1.0, 1.0, 0.5) is the bottom-right corner.
/// The default anchor point is AnchorPoint.Center (0.5, 0.5, 0.5).
/// An actor position is the distance between its parent-origin and this anchor-point.
/// An actor's orientation is the rotation from its default orientation, the rotation is centered around its anchor-point.
- /// Precondition : The Actor has been initialized. + /// 
The Actor has been initialized.
/// public Position AnchorPoint { @@ -1435,8 +1454,8 @@ namespace Tizen.NUI /// /// Gets/Sets the orientation of the Actor.
/// An actor's orientation is the rotation from its default orientation, and the rotation is centered around its anchor-point.
- /// Note: This is an asynchronous method.
/// + /// This is an asynchronous method. public Rotation Orientation { get @@ -1466,7 +1485,6 @@ namespace Tizen.NUI /// /// Gets/Sets the scale factor applied to an actor.
- /// Note : This is an asynchronous method.
/// public Vector3 Scale { @@ -1547,10 +1565,12 @@ namespace Tizen.NUI } /// - /// Retrieves the visibility flag of an actor.
- /// Note : If an actor is not visible, then the actor and its children will not be rendered.
- /// This is regardless of the individual visibility values of the children i.e.an actor will only be rendered if all of its parents have visibility set to true.
+ /// Retrieves the visibility flag of an actor. /// + /// + /// If an actor is not visible, then the actor and its children will not be rendered. + /// This is regardless of the individual visibility values of the children i.e.an actor will only be rendered if all of its parents have visibility set to true. + /// public bool Visible { get @@ -1839,7 +1859,7 @@ namespace Tizen.NUI } /// - /// Gets/Sets the width resize policy to be used for the given dimension(s). + /// Gets/Sets the width resize policy to be used. /// public ResizePolicyType WidthResizePolicy { @@ -1879,7 +1899,7 @@ namespace Tizen.NUI } /// - /// Gets/Sets the height resize policy to be used for the given dimension(s). + /// Gets/Sets the height resize policy to be used. /// public ResizePolicyType HeightResizePolicy { @@ -2110,17 +2130,25 @@ namespace Tizen.NUI } /// - /// This specifies whether the Actor uses its own color, or inherits.
- /// ColorMode.UseOwnColor : Actor will use its own color.
- /// ColorMode.UseParentColor : Actor will use its parent color.
- /// ColorMode.UseOwnMultiplyParentColor : Actor will blend its color with its parents color.
- /// ColorMode.UseOwnMultiplyParentAlpha : Actor will blend its alpha with its parents alpha. This means when parent fades in or out child does as well. This is the default.
+ /// This specifies whether the Actor uses its own color, or inherits. /// public enum ColorMode { + /// + /// Actor will use its own color. + /// UseOwnColor, + /// + /// Actor will use its parent color. + /// UseParentColor, + /// + /// Actor will blend its color with its parents color. + /// UseOwnMultiplyParentColor, + /// + /// Actor will blend its alpha with its parents alpha. This means when parent fades in or out child does as well. This is the default. + /// UseOwnMultiplyParentAlpha } @@ -2129,52 +2157,110 @@ namespace Tizen.NUI /// public enum DimensionType { + /// + /// Width dimension + /// Width = 0x1, + /// + /// Height dimension + /// Height = 0x2, + /// + /// Mask to cover all flags + /// AllDimensions = 0x3 } /// - /// This specifies draw mode types + /// Enumeration for the instance of how the actor and it's children will be drawn. /// public enum DrawModeType { + /// + /// The default draw-mode + /// Normal = 0, + /// + /// Draw the actor and its children as an overlay + /// Overlay2D = 1, + /// + /// Will be replaced by separate ClippingMode enum. Draw the actor and its children into the stencil buffer + /// Stencil = 3 } /// - /// This specifies resize policy types + /// Enumeration for size negotiation resize policies. /// public enum ResizePolicyType { + /// + /// Size is fixed as set by SetSize + /// Fixed, + /// + /// Size is to use the actor's natural size + /// + /// UseNaturalSize, + /// + /// Size is to fill up to the actor's parent's bounds. Aspect ratio is not maintained. + /// FillToParent, + /// + /// The actors size will be ( ParentSize * SizeRelativeToParentFactor ). + /// SizeRelativeToParent, + /// + /// The actors size will be ( ParentSize + SizeRelativeToParentFactor ). + /// SizeFixedOffsetFromParent, + /// + /// Size will adjust to wrap around all children + /// FitToChildren, + /// + /// One dimension is dependent on the other + /// DimensionDependency, + /// + /// The size will be assigned to the actor + /// UseAssignedSize } /// - /// This specifies size scale policy types + /// Enumeration for policies to determine how an actor should resize itself when having its size set in size negotiation. /// public enum SizeScalePolicyType { + /// + /// Use the size that was set + /// UseSizeSet, + /// + /// Fit within the size set maintaining natural size aspect ratio + /// FitWithAspectRatio, + /// + /// Fit within the size set maintaining natural size aspect ratio + /// FillWithAspectRatio } /// - /// This specifies clipping mode types + /// Enumeration for ClippingMode describing how this Actor's children will be clipped against it. /// public enum ClippingModeType { + /// + /// This Actor will not clip its children. + /// Disabled, + /// + /// This Actor will clip all children to within its boundaries (the actor will also be visible itself). + /// ClipChildren } diff --git a/src/Tizen.NUI/src/public/AlphaFunction.cs b/src/Tizen.NUI/src/public/AlphaFunction.cs index 342a3ad..6289aa7 100755 --- a/src/Tizen.NUI/src/public/AlphaFunction.cs +++ b/src/Tizen.NUI/src/public/AlphaFunction.cs @@ -108,8 +108,8 @@ namespace Tizen.NUI /// /// Constructor.
/// Creates a bezier alpha function.The bezier will have the first point at(0,0) and the end point at(1,1).
- /// Note : The x components of the control points will be clamped to the range[0, 1] to prevent non monotonic curves.
/// + /// The x components of the control points will be clamped to the range[0, 1] to prevent non monotonic curves. /// A Vector2 which will be used as the first control point of the curve /// A Vector2 which will be used as the second control point of the curve public AlphaFunction(Vector2 controlPoint0, Vector2 controlPoint1) : this(NDalicPINVOKE.new_AlphaFunction__SWIG_3(Vector2.getCPtr(controlPoint0), Vector2.getCPtr(controlPoint1)), true) @@ -167,19 +167,61 @@ namespace Tizen.NUI /// public enum BuiltinFunctions { + /// + /// Linear + /// Default, + /// + /// No transformation + /// Linear, + /// + /// Reverse linear + /// Reverse, + /// + /// Speeds up and comes to a sudden stop (Square) + /// EaseInSquare, + /// + /// Sudden start and slows to a gradual stop (Square) + /// EaseOutSquare, + /// + /// Speeds up and comes to a sudden stop (Cubic) + /// EaseIn, + /// + /// Sudden start and slows to a gradual stop (Cubic) + /// EaseOut, + /// + /// Speeds up and slows to a gradual stop (Cubic) + /// EaseInOut, + /// + /// Speeds up and comes to a sudden stop (sinusoidal) + /// EaseInSine, + /// + /// Sudden start and slows to a gradual stop (sinusoidal) + /// EaseOutSine, + /// + /// Speeds up and slows to a gradual stop (sinusoidal) + /// EaseInOutSine, + /// + /// Sudden start, loses momentum and returns to start position + /// Bounce, + /// + /// Single revolution + /// Sin, + /// + /// Sudden start, exceed end position and return to a gradual stop + /// EaseOutBack, Count } @@ -189,7 +231,13 @@ namespace Tizen.NUI /// public enum Modes { + /// + /// The user has provided a custom function + /// CustomFunction = 1, + /// + /// The user has provided the control points of a bezier curve + /// Bezier } diff --git a/src/Tizen.NUI/src/public/Animation.cs b/src/Tizen.NUI/src/public/Animation.cs index cf631a1..26e7e5d 100755 --- a/src/Tizen.NUI/src/public/Animation.cs +++ b/src/Tizen.NUI/src/public/Animation.cs @@ -26,7 +26,7 @@ namespace Tizen.NUI /// Animation can be used to animate the properties of any number of objects, typically Actors.
/// If the "Finished" event is connected to a member function of an object, it must be disconnected before the object is destroyed.
/// This is typically done in the object destructor, and requires either the Animation handle to be stored.
- /// The overall animation time is superseded by the values given in the Duration property used when calling the AnimateTo(), AnimateBy(), AnimateBetween() and AnimatePath() methods.
+ /// The overall animation time is superseded by the values given in the animation time used when calling the AnimateTo(), AnimateBy(), AnimateBetween() and AnimatePath() methods.
/// If any of the individual calls to those functions exceeds the overall animation time(Duration), then the overall animation time is automatically extended.
/// public class Animation : BaseHandle @@ -80,9 +80,9 @@ namespace Tizen.NUI /// The animation will not loop.
/// The default end action is "Cancel".
/// The default Alpha function is linear.
- /// Precodition : DurationmSeconds must be greater than zero.
/// - /// The duration in milli seconds (int). + /// DurationmSeconds must be greater than zero. + /// The duration in milli seconds. public Animation(int durationMilliSeconds) : this(NDalicPINVOKE.Animation_New((float)durationMilliSeconds / 1000.0f), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -163,7 +163,7 @@ namespace Tizen.NUI /// - /// Gets/Sets the duration of animation. + /// Gets/Sets the duration in milli seconds of the animation. /// public int Duration { @@ -178,7 +178,7 @@ namespace Tizen.NUI } /// - /// Gets/Sets the default alpha function for an animation. + /// Gets/Sets the default alpha function for the animation. /// public AlphaFunction DefaultAlphaFunction { @@ -274,7 +274,7 @@ namespace Tizen.NUI /// /// Gets the current loop count.
- /// A value 0 to CurrentLoop indicating the current loop count when looping.
+ /// A value 0 indicating the current loop count when looping.
/// public int CurrentLoop { @@ -369,8 +369,6 @@ namespace Tizen.NUI /// /// Animates a property value by a relative amount.
- /// The default alpha function will be used.
- /// The effect will start & end when the animation begins & ends.
/// /// The target object to animate /// The target property to animate @@ -388,23 +386,20 @@ namespace Tizen.NUI throw new System.Exception("second argument string property is invalid parameter!"); } - //dynamic obj = (object)relativeValue; PropertyValue val = PropertyValue.CreateFromObject(relativeValue); if (alphaFunction != null) { - AnimateBy(_prop, new PropertyValue(val), alphaFunction); + AnimateBy(_prop, val, alphaFunction); } else { - AnimateBy(_prop, new PropertyValue(val)); + AnimateBy(_prop, val); } } /// /// Animates a property value by a relative amount.
- /// The default alpha function will be used.
- /// The effect will start & end when the animation begins & ends.
/// /// The target object to animate /// The target property to animate @@ -424,25 +419,22 @@ namespace Tizen.NUI throw new System.Exception("second argument string property is invalid parameter!"); } - //dynamic obj = (object)relativeValue; PropertyValue val = PropertyValue.CreateFromObject(relativeValue); if (alphaFunction != null) { Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime)); - AnimateBy(_prop, new PropertyValue(val), alphaFunction, time); + AnimateBy(_prop, val, alphaFunction, time); } else { Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime)); - AnimateBy(_prop, new PropertyValue(val), time); + AnimateBy(_prop, val, time); } } /// /// Animates a property to a destination value.
- /// The default alpha function will be used.
- /// The effect will start & end when the animation begins & ends.
/// /// The target object to animate /// The target property to animate @@ -460,23 +452,20 @@ namespace Tizen.NUI throw new System.Exception("second argument string property is invalid parameter!"); } - //dynamic obj = (object)destinationValue; PropertyValue val = PropertyValue.CreateFromObject(destinationValue); if (alphaFunction != null) { - AnimateTo(_prop, new PropertyValue(val), alphaFunction); + AnimateTo(_prop, val, alphaFunction); } else { - AnimateTo(_prop, new PropertyValue(val)); + AnimateTo(_prop, val); } } /// /// Animates a property to a destination value.
- /// The default alpha function will be used.
- /// The effect will start & end when the animation begins & ends.
/// /// The target object to animate /// The target property to animate @@ -484,7 +473,7 @@ namespace Tizen.NUI /// The alpha function to apply /// Start time of animation /// End time of animation - /// + /// The alpha function to apply public void AnimateTo(Actor target, string property, object destinationValue, int startTime, int endTime, AlphaFunction alphaFunction = null) { string _str1 = property.Substring(0, 1); @@ -497,18 +486,17 @@ namespace Tizen.NUI throw new System.Exception("second argument string property is invalid parameter!"); } - //dynamic obj = (object)destinationValue; PropertyValue val = PropertyValue.CreateFromObject(destinationValue); if (alphaFunction != null) { Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime)); - AnimateTo(_prop, new PropertyValue(val), alphaFunction, time); + AnimateTo(_prop, val, alphaFunction, time); } else { Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime)); - AnimateTo(_prop, new PropertyValue(val), time); + AnimateTo(_prop, val, time); } } @@ -549,8 +537,8 @@ namespace Tizen.NUI /// The target object to animate /// The target property to animate /// The set of time/value pairs between which to animate - /// Start time of animation - /// End time of animation + /// Start time of animation in milli seconds + /// End time of animation in milli seconds /// The method used to interpolate between values /// The alpha function to apply public void AnimateBetween(Actor target, string property, KeyFrames keyFrames, int startTime, int endTime, Interpolation interpolation = Interpolation.Linear, AlphaFunction alphaFunction = null) @@ -789,7 +777,7 @@ namespace Tizen.NUI } /// - /// Play the animation. + /// Plays the animation. /// public void Play() { @@ -984,37 +972,56 @@ namespace Tizen.NUI } /// - /// Enumeration for what to do when the animation ends, is stopped, or is destroyed.
- /// Cancel : When the animation ends, the animated property values are saved.
- /// Discard : When the animation ends, the animated property values are forgotten.
- /// StopFinal : If the animation is stopped, the animated property values are saved as if the animation had run to completion, otherwise behaves like Cancel.
+ /// Enumeration for what to do when the animation ends, is stopped, or is destroyed. /// public enum EndActions { + /// + /// When the animation ends, the animated property values are saved. + /// Cancel, + /// + /// When the animation ends, the animated property values are forgotten. + /// Discard, + /// + /// If the animation is stopped, the animated property values are saved as if the animation had run to completion, otherwise behaves like Cancel. + /// StopFinal } /// - /// Enumeration for what interpolation method to use on key-frame animations.
- /// Linear : Values in between key frames are interpolated using a linear polynomial. (Default).
- /// Cubic : Values in between key frames are interpolated using a cubic polynomial.
+ /// Enumeration for what interpolation method to use on key-frame animations. /// public enum Interpolation { + /// + /// Values in between key frames are interpolated using a linear polynomial. (Default) + /// Linear, + /// + /// Values in between key frames are interpolated using a cubic polynomial. + /// Cubic } /// - /// Enumeration for what state the animation is in.
- /// Note: Calling Reset() on this class will NOT reset the animation. It will call BaseHandle.Reset() which drops the object handle.
+ /// Enumeration for what state the animation is in. /// + /// Calling Reset() on this class will NOT reset the animation. It will call BaseHandle.Reset() which drops the object handle. public enum States { + /// + /// Animation has stopped + /// Stopped, + /// + /// The animation is playing + /// Playing, + /// + /// The animation is paused + /// Paused } diff --git a/src/Tizen.NUI/src/public/CameraActor.cs b/src/Tizen.NUI/src/public/CameraActor.cs index 3f5f16a..b276ab6 100755 --- a/src/Tizen.NUI/src/public/CameraActor.cs +++ b/src/Tizen.NUI/src/public/CameraActor.cs @@ -29,7 +29,7 @@ namespace Tizen.NUI /// (configured to have the origin of the coordinate system at the top-left corner of the screen, and unit 1 as 1 pixel of the screen). This is a typical way.
/// - For 3D applications, you can change the view by manipulating the camera.You can translate or rotate the camera in this case.
/// Note that the top-left corner of the screen and unit 1 no longer are (0,0,0) and 1 pixel after manipulating the camera.
- /// There are two types of camera actor, FreeLook and LookAtTarget By default, the camera actor will be FreeLook.
+ /// There are two types of camera actor, FreeLook and LookAtTarget. By default, the camera actor will be FreeLook.
/// - A FreeLook camera uses actor's orientation to control where the camera is looking.
/// If no additional rotations are specified, the camera looks in the negative Z direction.
/// - For LookAtTarget, the actor's orientation is ignored, instead the camera looks at TargetPosition in world coordinates.
@@ -595,24 +595,32 @@ namespace Tizen.NUI } /// - /// Enumeration for type determination of how camera operates.
- /// FreeLook : Camera orientation is taken from CameraActor.
- /// LookAtTarget : Camera is oriented to always look at a target.
+ /// Enumeration for type determination of how camera operates. /// public enum CameraType { + /// + /// Camera orientation is taken from CameraActor. + /// FreeLook, + /// + /// Camera is oriented to always look at a target. + /// LookAtTarget } /// - /// Enumeration for projection modes.
- /// PerspectiveProjection : Distance causes foreshortening; objects further from the camera appear smaller.
- /// OrthographicProjection : Relative distance from the camera does not affect the size of objects.
+ /// Enumeration for projection modes. /// public enum ProjectionMode { + /// + /// Distance causes foreshortening; objects further from the camera appear smaller. + /// PerspectiveProjection, + /// + /// Relative distance from the camera does not affect the size of objects. + /// OrthographicProjection } diff --git a/src/Tizen.NUI/src/public/CheckBoxButton.cs b/src/Tizen.NUI/src/public/CheckBoxButton.cs index 09bab6a..44c953a 100755 --- a/src/Tizen.NUI/src/public/CheckBoxButton.cs +++ b/src/Tizen.NUI/src/public/CheckBoxButton.cs @@ -22,8 +22,7 @@ namespace Tizen.NUI /// /// CheckBoxButton provides a check box button which user can check or uncheck.
/// By default, a CheckBoxButton emits a Button.Clicked event when the button changes its state to selected or unselected.
- /// The button's appearance could be modified by Button.UnselectedImage, Button.BackgroundImage, Button.SelectedImage, - /// Button.SelectedBackgroundImage, Button.DisabledBackgroundImage, Button.DisabledImage, and Button.DisabledSelectedImage.
+ /// The button's appearance could be modified by Button.UnselectedImage, Button.BackgroundImage, Button.SelectedImage, Button.SelectedBackgroundImage, Button.DisabledBackgroundImage, Button.DisabledImage, and Button.DisabledSelectedImage.
/// When the button is not disabled, if it's not selected it only shows the background image.
/// The selected image is shown over the background image when the box is selected (background image is not replaced by \e selected image).
/// When the button is disabled, background image and selected image are replaced by disabled images.
diff --git a/src/Tizen.NUI/src/public/CustomView.cs b/src/Tizen.NUI/src/public/CustomView.cs index f5b11f6..b5c6975 100755 --- a/src/Tizen.NUI/src/public/CustomView.cs +++ b/src/Tizen.NUI/src/public/CustomView.cs @@ -14,6 +14,7 @@ * limitations under the License. * */ +using System.ComponentModel; namespace Tizen.NUI { @@ -494,7 +495,7 @@ namespace Tizen.NUI /// /// The child actor to calculate the size for /// The dimension to calculate the size for. E.g. width or height - /// Return the calculated size for the given dimension + /// Return the calculated size for the given dimension. If more than one dimension is requested, just return the first one found. public virtual float CalculateChildSize(Actor child, DimensionType dimension) { return viewWrapperImpl.CalculateChildSizeBase(child, dimension); @@ -721,10 +722,23 @@ namespace Tizen.NUI /// public enum CustomViewBehaviour { + /// + /// Use to provide default behaviour (size negotiation is on, event callbacks are not called) + /// ViewBehaviourDefault = 0, + /// + /// True if control does not need size negotiation, i.e. it can be skipped in the algorithm + /// DisableSizeNegotiation = 1 << 0, + /// + /// Use to provide key navigation support. + /// RequiresKeyboardNavigationSupport = 1 << 5, + /// + /// Use to make style change event disabled. + /// DisableStyleChangeSignals = 1 << 6, + [EditorBrowsable(EditorBrowsableState.Never)] LastViewBehaviourFlag } } diff --git a/src/Tizen.NUI/src/public/CustomView/Spin.cs b/src/Tizen.NUI/src/public/CustomView/Spin.cs index efa4161..1cb374d 100755 --- a/src/Tizen.NUI/src/public/CustomView/Spin.cs +++ b/src/Tizen.NUI/src/public/CustomView/Spin.cs @@ -203,7 +203,7 @@ namespace Tizen.NUI set { - Console.WriteLine("Value set to " + value); + Tizen.Log.Debug("NUI", "Value set to " + value); _currentValue = value; // Make sure no invalid value is accepted @@ -320,7 +320,7 @@ namespace Tizen.NUI } set { - Console.WriteLine("TextColor set to " + value.R + "," + value.G + "," + value.B); + Tizen.Log.Debug("NUI", "TextColor set to " + value.R + "," + value.G + "," + value.B); _textColor = value; _textField.TextColor = _textColor; @@ -378,4 +378,4 @@ namespace Tizen.NUI } } } -} \ No newline at end of file +} diff --git a/src/Tizen.NUI/src/public/CustomView/VisualView.cs b/src/Tizen.NUI/src/public/CustomView/VisualView.cs index f43bceb..e6c8b23 100755 --- a/src/Tizen.NUI/src/public/CustomView/VisualView.cs +++ b/src/Tizen.NUI/src/public/CustomView/VisualView.cs @@ -21,18 +21,22 @@ namespace Tizen.NUI using System.Linq; /// - /// A visual view control for user add any visual to it.
- /// Example:
- /// VisualView _visualView = new VisualView();
- /// ImageVisualMap imageVisualMap1 = new ImageVisualMap();
- /// imageVisualMap1.URL = "./NUISample/res/images/image-1.jpg";
- /// imageVisualMap1.VisualSize = new Vector2( 300.0f, 300.0f );
- /// imageVisualMap1.Offset = new Vector2( 50.0f, 50.0f );
- /// imageVisualMap1.OffsetSizeMode = new Vector4( 1.0f, 1.0f, 1.0f, 1.0f );
- /// imageVisualMap1.Origin = AlignType.TOP_BEGIN;
- /// imageVisualMap1.AnchorPoint = AlignType.TOP_BEGIN;
- /// _visualView.AddVisual("imageVisual1", imageVisualMap1);
+ /// A visual view control for user add any visual to it. /// + /// + /// Example: + /// + /// VisualView _visualView = new VisualView(); + /// ImageVisualMap imageVisualMap1 = new ImageVisualMap(); + /// imageVisualMap1.URL = "./NUISample/res/images/image-1.jpg"; + /// imageVisualMap1.VisualSize = new Vector2( 300.0f, 300.0f ); + /// imageVisualMap1.Offset = new Vector2( 50.0f, 50.0f ); + /// imageVisualMap1.OffsetSizeMode = new Vector4( 1.0f, 1.0f, 1.0f, 1.0f ); + /// imageVisualMap1.Origin = AlignType.TOP_BEGIN; + /// imageVisualMap1.AnchorPoint = AlignType.TOP_BEGIN; + /// _visualView.AddVisual("imageVisual1", imageVisualMap1); + /// + /// public class VisualView : CustomView { //private LinkedList _visualList = null; @@ -157,8 +161,8 @@ namespace Tizen.NUI /// Called after the size negotiation has been finished for this control.
/// The control is expected to assign this given size to itself/its children.
/// Should be overridden by derived classes if they need to layout actors differently after certain operations like add or remove actors, resize or after changing specific properties.
- /// Note! As this function is called from inside the size negotiation algorithm, you cannot call RequestRelayout (the call would just be ignored).
/// + /// As this function is called from inside the size negotiation algorithm, you cannot call RequestRelayout (the call would just be ignored) /// The allocated size /// The control should add actors to this container that it is not able to allocate a size for. public override void OnRelayout(Vector2 size, RelayoutContainer container) diff --git a/src/Tizen.NUI/src/public/FocusManager.cs b/src/Tizen.NUI/src/public/FocusManager.cs index 09b7bc5..2038f3c 100755 --- a/src/Tizen.NUI/src/public/FocusManager.cs +++ b/src/Tizen.NUI/src/public/FocusManager.cs @@ -447,6 +447,10 @@ namespace Tizen.NUI { View ret = View.DownCast(new Actor(NDalicManualPINVOKE.FocusManager_GetCurrentFocusActor(swigCPtr), true)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + if (ret.HasBody() == false) + { + return null; + } return ret; } @@ -534,6 +538,10 @@ namespace Tizen.NUI { View ret = View.DownCast(new Actor(NDalicManualPINVOKE.FocusManager_GetFocusGroup(swigCPtr, Actor.getCPtr(view)), true)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + if (ret.HasBody() == false) + { + return null; + } return ret; } @@ -563,6 +571,10 @@ namespace Tizen.NUI { View ret = View.DownCast(new Actor(NDalicManualPINVOKE.FocusManager_GetFocusIndicatorActor(swigCPtr), true)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + if (ret.HasBody() == false) + { + return null; + } return ret; } diff --git a/src/Tizen.NUI/src/public/KeyFrames.cs b/src/Tizen.NUI/src/public/KeyFrames.cs index 7fd8194..f233153 100755 --- a/src/Tizen.NUI/src/public/KeyFrames.cs +++ b/src/Tizen.NUI/src/public/KeyFrames.cs @@ -83,8 +83,8 @@ namespace Tizen.NUI /// A value public void Add(float progress, object value) { - dynamic obj = value; - Add(progress, new PropertyValue(obj)); + PropertyValue val = PropertyValue.CreateFromObject(value); + Add(progress, val); } /// @@ -95,8 +95,8 @@ namespace Tizen.NUI /// The alpha function used to blend to the next keyframe public void Add(float progress, object value, AlphaFunction alpha) { - dynamic obj = value; - Add(progress, new PropertyValue(obj), alpha); + PropertyValue val = PropertyValue.CreateFromObject(value); + Add(progress, val, alpha); } /// diff --git a/src/Tizen.NUI/src/public/NUIApplication.cs b/src/Tizen.NUI/src/public/NUIApplication.cs index e2e80a8..58ec099 100755 --- a/src/Tizen.NUI/src/public/NUIApplication.cs +++ b/src/Tizen.NUI/src/public/NUIApplication.cs @@ -30,7 +30,7 @@ namespace Tizen.NUI private void LOG(string _str) { //Tizen.Log.Debug("NUI", _str); - //Console.WriteLine("[NUI]" + _str); + //Tizen.Log.Debug("NUI", "[NUI]" + _str); } /// diff --git a/src/Tizen.NUI/src/public/Property.cs b/src/Tizen.NUI/src/public/Property.cs index 38931eb..af5873c 100755 --- a/src/Tizen.NUI/src/public/Property.cs +++ b/src/Tizen.NUI/src/public/Property.cs @@ -963,63 +963,93 @@ namespace Tizen.NUI if (type.Equals(typeof(int))) { - System.Console.WriteLine(" got an int property value "); + Tizen.Log.Debug("NUI", " got an int property value "); value = new PropertyValue((int)obj); } if (type.Equals(typeof(System.Int32))) { - System.Console.WriteLine(" got an int property value "); + Tizen.Log.Debug("NUI", " got an int property value "); value = new PropertyValue((int)obj); } else if (type.Equals(typeof(bool))) { - System.Console.WriteLine(" got an bool property value "); + Tizen.Log.Debug("NUI", " got an bool property value "); value = new PropertyValue((bool)obj); } else if (type.Equals(typeof(float))) { - System.Console.WriteLine(" got an float property value "); + Tizen.Log.Debug("NUI", " got an float property value "); value = new PropertyValue((float)obj); } else if (type.Equals(typeof(string))) { - System.Console.WriteLine(" got a string property value "); + Tizen.Log.Debug("NUI", " got a string property value "); value = new PropertyValue((string)obj); } else if (type.Equals(typeof(Vector2))) { - System.Console.WriteLine(" got an Vector2 property value "); + Tizen.Log.Debug("NUI", " got an Vector2 property value "); value = new PropertyValue((Vector2)obj); } else if (type.Equals(typeof(Vector3))) { - System.Console.WriteLine(" got an Vector3 property value "); + Tizen.Log.Debug("NUI", " got an Vector3 property value "); value = new PropertyValue((Vector3)obj); } else if (type.Equals(typeof(Vector4))) { - System.Console.WriteLine(" got an Vector4 property value "); + Tizen.Log.Debug("NUI", " got an Vector4 property value "); value = new PropertyValue((Vector4)obj); } else if (type.Equals(typeof(Position))) { - System.Console.WriteLine(" got an Position property value "); + Tizen.Log.Debug("NUI", " got an Position property value "); value = new PropertyValue((Position)obj); } + else if (type.Equals(typeof(Position2D))) + { + Tizen.Log.Debug("NUI", " got an Position2D property value "); + value = new PropertyValue((Position2D)obj); + } else if (type.Equals(typeof(Size))) { - System.Console.WriteLine(" got an Size property value "); + Tizen.Log.Debug("NUI", " got an Size property value "); value = new PropertyValue((Size)obj); } + else if (type.Equals(typeof(Size2D))) + { + Tizen.Log.Debug("NUI", " got an Size2D property value "); + value = new PropertyValue((Size2D)obj); + } else if (type.Equals(typeof(Color))) { - System.Console.WriteLine(" got an Color property value "); + Tizen.Log.Debug("NUI", " got an Color property value "); value = new PropertyValue((Color)obj); } + else if (type.Equals(typeof(Rotation))) + { + Tizen.Log.Debug("NUI", " got an Rotation property value "); + value = new PropertyValue((Rotation)obj); + } + else if (type.Equals(typeof(RelativeVector2))) + { + Tizen.Log.Debug("NUI", " got an RelativeVector2 property value "); + value = new PropertyValue((RelativeVector2)obj); + } + else if (type.Equals(typeof(RelativeVector3))) + { + Tizen.Log.Debug("NUI", " got an RelativeVector3 property value "); + value = new PropertyValue((RelativeVector3)obj); + } + else if (type.Equals(typeof(RelativeVector4))) + { + Tizen.Log.Debug("NUI", " got an RelativeVector4 property value "); + value = new PropertyValue((RelativeVector4)obj); + } else { - throw new global::System.InvalidOperationException("Unimplemented type for Property Value"); + throw new global::System.InvalidOperationException("Unimplemented type for Property Value :" + type.Name); } return value; } @@ -1471,34 +1501,90 @@ namespace Tizen.NUI } /// - /// This specifies all the property types. + /// This specifies all the property types.
+ /// Enumeration for the property types supported. /// public enum PropertyType { + /// + /// No type + /// None, + /// + /// A boolean type + /// Boolean, + /// + /// A float type + /// Float, + /// + /// An integer type + /// Integer, + /// + /// a vector array of size=2 with float precision + /// Vector2, + /// + /// a vector array of size=3 with float precision + /// Vector3, + /// + /// a vector array of size=4 with float precision + /// Vector4, + /// + /// a 3x3 matrix + /// Matrix3, + /// + /// a 4x4 matrix + /// Matrix, + /// + /// an integer array of size=4 + /// Rectangle, + /// + /// either a quaternion or an axis angle rotation + /// Rotation, + /// + /// A string type + /// String, + /// + /// an array of PropertyValue + /// Array, + /// + /// a string key to PropertyValue mapping + /// Map } /// - /// This specifies the property access mode types. + /// This specifies the property access mode types.
+ /// Enumeration for the access mode for custom properties. /// public enum PropertyAccessMode { + /// + /// if the property is read-only + /// ReadOnly, + /// + /// If the property is read/writeable + /// ReadWrite, + /// + /// If the property can be animated or constrained + /// Animatable, + /// + /// The number of access modes + /// AccessModeCount } diff --git a/src/Tizen.NUI/src/public/StyleManager.cs b/src/Tizen.NUI/src/public/StyleManager.cs index c1f77bd..3025e3b 100755 --- a/src/Tizen.NUI/src/public/StyleManager.cs +++ b/src/Tizen.NUI/src/public/StyleManager.cs @@ -15,17 +15,11 @@ namespace Tizen.NUI using System.Runtime.InteropServices; /// - /// StyleManager informs applications of system theme change, - /// and supports application theme change at runtime.
+ /// StyleManager informs applications of system theme change, and supports application theme change at runtime.
/// Applies various styles to Controls using the properties system.
- /// On theme change, it automatically updates all controls, then raises - /// a event to inform the application.
- ///
- /// If the application wants to customize the theme, RequestThemeChange - /// needs to be called.
- /// It provides the path to the application resource root folder, - /// from there the filename can an be specified along with - /// any sub folders, e.g Images, Models etc.
+ /// On theme change, it automatically updates all controls, then raises a event to inform the application.
+ /// If the application wants to customize the theme, RequestThemeChange needs to be called.
+ /// It provides the path to the application resource root folder, from there the filename can an be specified along with any sub folders, e.g Images, Models etc.
/// public class StyleManager : BaseHandle { @@ -258,12 +252,21 @@ namespace Tizen.NUI } /// - /// Types of style change. + /// Types of style change. Enumeration for StyleChange type. /// public enum StyleChangeType { + /// + /// Denotes that the default font has changed. + /// DefaultFontChange, + /// + /// Denotes that the default font size has changed. + /// DefaultFontSizeChange, + /// + /// Denotes that the theme has changed. + /// ThemeChange } diff --git a/src/Tizen.NUI/src/public/TableView.cs b/src/Tizen.NUI/src/public/TableView.cs index 39b484e..bdd21ec 100755 --- a/src/Tizen.NUI/src/public/TableView.cs +++ b/src/Tizen.NUI/src/public/TableView.cs @@ -819,8 +819,17 @@ namespace Tizen.NUI /// public enum HorizontalAlignmentType { + /// + /// Align horizontally left + /// Left, + /// + /// Align horizontally center + /// Center, + /// + /// Align horizontally right + /// Right } @@ -829,8 +838,17 @@ namespace Tizen.NUI /// public enum VerticalAlignmentType { + /// + /// Align vertically top + /// Top, + /// + /// Align vertically center + /// Center, + /// + /// Align vertically bottom + /// Bottom } diff --git a/src/Tizen.NUI/src/public/Touch.cs b/src/Tizen.NUI/src/public/Touch.cs index c8ae465..057562c 100755 --- a/src/Tizen.NUI/src/public/Touch.cs +++ b/src/Tizen.NUI/src/public/Touch.cs @@ -237,13 +237,38 @@ namespace Tizen.NUI /// public enum PointStateType { + /// + /// Touch or hover started + /// Started, + /// + /// Touch or hover finished + /// Finished, + /// + /// Screen touched + /// Down = Started, + /// + /// Touch stopped + /// Up = Finished, + /// + /// Finger dragged or hovered + /// Motion, + /// + /// Leave the boundary of an actor + /// Leave, + /// + /// No change from last event.
+ /// Useful when a multi-point event occurs where all points are sent but indicates that this particular point has not changed since the last time. + /// Stationary, + /// + /// A system event has occurred which has interrupted the touch or hover event sequence. + /// Interrupted } diff --git a/src/Tizen.NUI/src/public/View.cs b/src/Tizen.NUI/src/public/View.cs index 385ba60..dc1eff7 100755 --- a/src/Tizen.NUI/src/public/View.cs +++ b/src/Tizen.NUI/src/public/View.cs @@ -648,7 +648,7 @@ namespace Tizen.NUI /// - /// Describes the direction to move the keyboard focus towards. + /// Describes the direction to move the focus towards. /// public enum FocusDirection { diff --git a/src/Tizen.NUI/src/public/VisualBase.cs b/src/Tizen.NUI/src/public/VisualBase.cs index 155dca8..eca68e0 100755 --- a/src/Tizen.NUI/src/public/VisualBase.cs +++ b/src/Tizen.NUI/src/public/VisualBase.cs @@ -15,7 +15,6 @@ namespace Tizen.NUI /// Sets whether the actor should be focusable by keyboard navigation.
/// Visuals reuse geometry, shader etc. across controls. They ensure that the renderer and texture sets exist only when control is on-stage.
/// Each visual also responds to actor size and color change, and provides clipping at the renderer level.
- /// Note: The visual responds to the the Actor::COLOR by blending it with the 'Multiply' operator.
/// public class VisualBase : BaseHandle { diff --git a/src/Tizen.NUI/src/public/VisualMaps.cs b/src/Tizen.NUI/src/public/VisualMaps.cs index e16ea3c..198c2c2 100755 --- a/src/Tizen.NUI/src/public/VisualMaps.cs +++ b/src/Tizen.NUI/src/public/VisualMaps.cs @@ -35,6 +35,7 @@ namespace Tizen.NUI private float _depthIndex = 0.0f; protected PropertyMap _outputVisualMap = null; + internal string Name { set; @@ -229,6 +230,75 @@ namespace Tizen.NUI } } + protected PropertyMap _shader = null; + //private PropertyMap _transform = null; + protected bool? _premultipliedAlpha = null; + protected Color _mixColor = null; + protected float? _opacity = null; + protected PropertyMap _commonlyUsedMap = null; + + /// + /// The shader to use in the visual. + /// + public PropertyMap Shader + { + get + { + return _shader; + } + set + { + _shader = value; + UpdateVisual(); + } + } + /// + /// Enables/disables premultiplied alpha.
+ /// The premultiplied alpha is false by default unless this behaviour is modified by the derived Visual type. + /// + public bool PremultipliedAlpha + { + get + { + return _premultipliedAlpha??false; + } + set + { + _premultipliedAlpha = value; + UpdateVisual(); + } + } + /// + /// Mix color is a blend color for any visual. + /// + public Color MixColor + { + get + { + return _mixColor; + } + set + { + _mixColor = value; + UpdateVisual(); + } + } + /// + /// Opacity is the alpha component of the mixColor, above. + /// + public float Opacity + { + get + { + return _opacity??(-1.0f); + } + set + { + _opacity = value; + UpdateVisual(); + } + } + } /// @@ -448,8 +518,11 @@ namespace Tizen.NUI if (_pixelArea != null) { _outputVisualMap.Add(ImageVisualProperty.PixelArea, new PropertyValue(_pixelArea)); } if (_wrapModeU != null) { _outputVisualMap.Add(ImageVisualProperty.WrapModeU, new PropertyValue((int)_wrapModeU)); } if (_wrapModeV != null) { _outputVisualMap.Add(ImageVisualProperty.WrapModeV, new PropertyValue((int)_wrapModeV)); } + if (_shader != null) { _outputVisualMap.Add((int)Visual.Property.Shader, new PropertyValue(_shader)); } + if (_premultipliedAlpha != null) { _outputVisualMap.Add((int)Visual.Property.PremultipliedAlpha, new PropertyValue((bool)_premultipliedAlpha)); } + if (_mixColor != null) { _outputVisualMap.Add((int)Visual.Property.MixColor, new PropertyValue(_mixColor)); } + if (_opacity != null) { _outputVisualMap.Add((int)Visual.Property.Opacity, new PropertyValue((float)_opacity)); } } - } /// @@ -694,6 +767,10 @@ namespace Tizen.NUI if (_verticalAlignment != null) { _outputVisualMap.Add(TextVisualProperty.VerticalAlignment, new PropertyValue(_verticalAlignment)); } if (_textColor != null) { _outputVisualMap.Add(TextVisualProperty.TextColor, new PropertyValue(_textColor)); } if (_enableMarkup != null) { _outputVisualMap.Add(TextVisualProperty.EnableMarkup, new PropertyValue((bool)_enableMarkup)); } + if (_shader != null) { _outputVisualMap.Add((int)Visual.Property.Shader, new PropertyValue(_shader)); } + if (_premultipliedAlpha != null) { _outputVisualMap.Add((int)Visual.Property.PremultipliedAlpha, new PropertyValue((bool)_premultipliedAlpha)); } + if (_mixColor != null) { _outputVisualMap.Add((int)Visual.Property.MixColor, new PropertyValue(_mixColor)); } + if (_opacity != null) { _outputVisualMap.Add((int)Visual.Property.Opacity, new PropertyValue((float)_opacity)); } } } @@ -766,6 +843,10 @@ namespace Tizen.NUI if (_color != null) { _outputVisualMap.Add(BorderVisualProperty.Color, new PropertyValue(_color)); } if (_size != null) { _outputVisualMap.Add(BorderVisualProperty.Size, new PropertyValue((float)_size)); } if (_antiAliasing != null) { _outputVisualMap.Add(BorderVisualProperty.AntiAliasing, new PropertyValue((bool)_antiAliasing)); } + if (_shader != null) { _outputVisualMap.Add((int)Visual.Property.Shader, new PropertyValue(_shader)); } + if (_premultipliedAlpha != null) { _outputVisualMap.Add((int)Visual.Property.PremultipliedAlpha, new PropertyValue((bool)_premultipliedAlpha)); } + if (_mixColor != null) { _outputVisualMap.Add((int)Visual.Property.MixColor, new PropertyValue(_mixColor)); } + if (_opacity != null) { _outputVisualMap.Add((int)Visual.Property.Opacity, new PropertyValue((float)_opacity)); } } } @@ -778,20 +859,20 @@ namespace Tizen.NUI { } - private Color _mixColor = null; + private Color _mixColorForColorVisual = null; /// /// Get or set the solid color required. /// - public Color MixColor + public Color Color { get { - return _mixColor; + return _mixColorForColorVisual; } set { - _mixColor = value; + _mixColorForColorVisual = value; UpdateVisual(); } } @@ -800,7 +881,10 @@ namespace Tizen.NUI { _outputVisualMap = new PropertyMap(); _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Color)); - if (_mixColor != null) { _outputVisualMap.Add(ColorVisualProperty.MixColor, new PropertyValue(_mixColor)); } + if (_mixColorForColorVisual != null) { _outputVisualMap.Add(ColorVisualProperty.MixColor, new PropertyValue(_mixColorForColorVisual)); } + if (_shader != null) { _outputVisualMap.Add((int)Visual.Property.Shader, new PropertyValue(_shader)); } + if (_premultipliedAlpha != null) { _outputVisualMap.Add((int)Visual.Property.PremultipliedAlpha, new PropertyValue((bool)_premultipliedAlpha)); } + if (_opacity != null) { _outputVisualMap.Add((int)Visual.Property.Opacity, new PropertyValue((float)_opacity)); } } } @@ -972,6 +1056,10 @@ namespace Tizen.NUI if (_stopColor != null) { _outputVisualMap.Add(GradientVisualProperty.StopColor, new PropertyValue(_stopColor)); } if (_units != null) { _outputVisualMap.Add(GradientVisualProperty.Units, new PropertyValue((int)_units)); } if (_spreadMethod != null) { _outputVisualMap.Add(GradientVisualProperty.SpreadMethod, new PropertyValue((int)_spreadMethod)); } + if (_shader != null) { _outputVisualMap.Add((int)Visual.Property.Shader, new PropertyValue(_shader)); } + if (_premultipliedAlpha != null) { _outputVisualMap.Add((int)Visual.Property.PremultipliedAlpha, new PropertyValue((bool)_premultipliedAlpha)); } + if (_mixColor != null) { _outputVisualMap.Add((int)Visual.Property.MixColor, new PropertyValue(_mixColor)); } + if (_opacity != null) { _outputVisualMap.Add((int)Visual.Property.Opacity, new PropertyValue((float)_opacity)); } } } @@ -1123,6 +1211,11 @@ namespace Tizen.NUI if (_shadingMode != null) { _outputVisualMap.Add(MeshVisualProperty.ShadingMode, new PropertyValue((int)_shadingMode)); } if (_useMipmapping != null) { _outputVisualMap.Add(MeshVisualProperty.UseMipmapping, new PropertyValue((bool)_useMipmapping)); } if (_useSoftNormals != null) { _outputVisualMap.Add(MeshVisualProperty.UseSoftNormals, new PropertyValue((bool)_useSoftNormals)); } + if (_shader != null) { _outputVisualMap.Add((int)Visual.Property.Shader, new PropertyValue(_shader)); } + if (_premultipliedAlpha != null) { _outputVisualMap.Add((int)Visual.Property.PremultipliedAlpha, new PropertyValue((bool)_premultipliedAlpha)); } + if (_mixColor != null) { _outputVisualMap.Add((int)Visual.Property.MixColor, new PropertyValue(_mixColor)); } + if (_opacity != null) { _outputVisualMap.Add((int)Visual.Property.Opacity, new PropertyValue((float)_opacity)); } + } } @@ -1136,7 +1229,7 @@ namespace Tizen.NUI } private PrimitiveVisualShapeType? _shape = null; - private Color _mixColor = null; + private Color _mixColorForPrimitiveVisual = null; private int? _slices = null; private int? _stacks = null; private float? _scaleTopRadius = null; @@ -1174,11 +1267,11 @@ namespace Tizen.NUI { get { - return _mixColor; + return _mixColorForPrimitiveVisual; } set { - _mixColor = value; + _mixColorForPrimitiveVisual = value; UpdateVisual(); } } @@ -1390,7 +1483,7 @@ namespace Tizen.NUI _outputVisualMap = new PropertyMap(); ; _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Primitive)); if (_shape != null) { _outputVisualMap.Add(PrimitiveVisualProperty.Shape, new PropertyValue((int)_shape)); } - if (_mixColor != null) { _outputVisualMap.Add(PrimitiveVisualProperty.MixColor, new PropertyValue(_mixColor)); } + if (_mixColorForPrimitiveVisual != null) { _outputVisualMap.Add(PrimitiveVisualProperty.MixColor, new PropertyValue(_mixColorForPrimitiveVisual)); } if (_slices != null) { _outputVisualMap.Add(PrimitiveVisualProperty.Slices, new PropertyValue((int)_slices)); } if (_stacks != null) { _outputVisualMap.Add(PrimitiveVisualProperty.Stacks, new PropertyValue((int)_stacks)); } if (_scaleTopRadius != null) { _outputVisualMap.Add(PrimitiveVisualProperty.ScaleTopRadius, new PropertyValue((float)_scaleTopRadius)); } @@ -1401,6 +1494,9 @@ namespace Tizen.NUI if (_bevelPercentage != null) { _outputVisualMap.Add(PrimitiveVisualProperty.BevelPercentage, new PropertyValue((float)_bevelPercentage)); } if (_bevelSmoothness != null) { _outputVisualMap.Add(PrimitiveVisualProperty.BevelSmoothness, new PropertyValue((float)_bevelSmoothness)); } if (_lightPosition != null) { _outputVisualMap.Add(PrimitiveVisualProperty.LightPosition, new PropertyValue(_lightPosition)); } + if (_shader != null) { _outputVisualMap.Add((int)Visual.Property.Shader, new PropertyValue(_shader)); } + if (_premultipliedAlpha != null) { _outputVisualMap.Add((int)Visual.Property.PremultipliedAlpha, new PropertyValue((bool)_premultipliedAlpha)); } + if (_opacity != null) { _outputVisualMap.Add((int)Visual.Property.Opacity, new PropertyValue((float)_opacity)); } } } @@ -1474,27 +1570,51 @@ namespace Tizen.NUI if (_url != null) { _outputVisualMap.Add(NpatchImageVisualProperty.URL, new PropertyValue(_url)); } if (_borderOnly != null) { _outputVisualMap.Add(NpatchImageVisualProperty.BorderOnly, new PropertyValue((bool)_borderOnly)); } if (_border != null) { _outputVisualMap.Add(NpatchImageVisualProperty.Border, new PropertyValue(_border)); } + if (_shader != null) { _outputVisualMap.Add((int)Visual.Property.Shader, new PropertyValue(_shader)); } + if (_premultipliedAlpha != null) { _outputVisualMap.Add((int)Visual.Property.PremultipliedAlpha, new PropertyValue((bool)_premultipliedAlpha)); } + if (_mixColor != null) { _outputVisualMap.Add((int)Visual.Property.MixColor, new PropertyValue(_mixColor)); } + if (_opacity != null) { _outputVisualMap.Add((int)Visual.Property.Opacity, new PropertyValue((float)_opacity)); } + } } /// - /// This specifies wrap mode types + /// This specifies wrap mode types
+ /// WrapModeU and WrapModeV separately decide how the texture should be sampled when the u and v coordinate exceeds the range of 0.0 to 1.0. /// public enum WrapModeType { + /// + /// Defualt value + /// Default = 0, + /// + /// Clamp to edge + /// ClampToEdge, + /// + /// Repeat + /// Repeat, + /// + /// Mirrored repeat + /// MirroredRepeat } /// - /// This specifies all kind os types of coordinate system for certain attributes of the points in a gradient. + /// The type of coordinate system for certain attributes of the points in a gradient. /// public enum GradientVisualUnitsType { + /// + /// Uses the normals for the start, end & center points, i.e. top-left is (-0.5, -0.5) and bottom-right is (0.5, 0.5). + /// ObjectBoundingBox, + /// + /// Uses the user coordinates for the start, end & center points, i.e. in a 200 by 200 control, top-left is (0, 0) and bottom-right is (200, 200). + /// UserSpace } @@ -1504,32 +1624,71 @@ namespace Tizen.NUI /// public enum GradientVisualSpreadMethodType { + /// + /// Uses the terminal colors of the gradient to fill the remainder of the quad. + /// Pad, + /// + /// Reflect the gradient pattern start-to-end, end-to-start, start-to-end etc. until the quad is filled. + /// Reflect, + /// + /// Repeat the gradient pattern start-to-end, start-to-end, start-to-end etc. until the quad is filled. + /// Repeat } /// - /// This specifies shading mode types. + /// The shading mode used by MeshVisual. /// public enum MeshVisualShadingModeValue { + /// + /// *Simplest*. One color that is lit by ambient and diffuse lighting. + /// TexturelessWithDiffuseLighting, + /// + /// Uses only the visual image textures provided with specular lighting in addition to ambient and diffuse lighting. + /// TexturedWithSpecularLighting, + /// + /// Uses all textures provided including a gloss, normal and texture map along with specular, ambient and diffuse lighting. + /// TexturedWithDetailedSpecularLighting } /// - /// This specifies shape types. + /// The primitive shape to render as a PrimitiveVisual. /// public enum PrimitiveVisualShapeType { + /// + /// A perfectly round geometrical object in three-dimensional space. + /// Sphere, + /// + /// The area bound between two circles, i.e. a cone with the tip removed. + /// ConicalFrustrum, + /// + /// Equivalent to a conical frustrum with top radius of zero. + /// Equivalent to a conical frustrum with top radius of zero. Cone, + /// + /// Equivalent to a conical frustrum with top radius of zero. + /// Cylinder, + /// + /// Equivalent to a conical frustrum with equal radii for the top and bottom circles. + /// Cube, + /// + /// Equivalent to a bevelled cube with a bevel percentage of zero. + /// Octahedron, + /// + /// Equivalent to a bevelled cube with a bevel percentage of one. + /// BevelledCube } @@ -1540,26 +1699,61 @@ namespace Tizen.NUI /// public enum FittingModeType { + /// + /// Full-screen image display: Limit loaded image resolution to device resolution using ShrinkToFit mode. + /// ShrinkToFit, + /// + /// Thumbnail gallery grid: Limit loaded image resolution to screen tile using ScaleToFill mode. + /// ScaleToFill, + /// + /// Image columns: Limit loaded image resolution to column width using FitWidth mode. + /// FitWidth, + /// + /// Image rows: Limit loaded image resolution to row height using FitHeight mode. + /// FitHeight } /// /// This specifies sampling mode types. Filtering options, used when resizing images to sample original pixels.
/// A SamplingMode controls how pixels in an input image are sampled and combined to generate each pixel of a destination image during a scaling.
- /// NoFilter and Box modes do not guarantee that the output pixel array exactly matches the rectangle specified by the desired dimensions and FittingMode, + /// NoFilter and Box modes do not guarantee that the output pixel array exactly matches the rectangle specified by the desired dimensions and FittingMode,
/// but all other filter modes do if the desired dimensions are `<=` the raw dimensions of the input image file.
/// public enum SamplingModeType { + /// + /// Iteratively box filter to generate an image of 1/2, 1/4, 1/8, etc width and height and approximately the desired size.
+ /// This is the default. + /// Box, + /// + /// For each output pixel, read one input pixel. + /// Nearest, + /// + /// For each output pixel, read a quad of four input pixels and write a weighted average of them. + /// Linear, + /// + /// Iteratively box filter to generate an image of 1/2, 1/4, 1/8 etc width and height and approximately the desired size,
+ /// then for each output pixel, read one pixel from the last level of box filtering.
+ /// BoxThenNearest, + /// + /// Iteratively box filter to almost the right size, then for each output pixel, read four pixels from the last level of box filtering and write their weighted average. + /// BoxThenLinear, + /// + /// No filtering is performed. If the SCALE_TO_FILL scaling mode is enabled, the borders of the image may be trimmed to match the aspect ratio of the desired dimensions. + /// NoFilter, + /// + /// For caching algorithms where a client strongly prefers a cache-hit to reuse a cached image. + /// DontCare } @@ -1568,7 +1762,13 @@ namespace Tizen.NUI /// public enum VisualTransformPolicyType { + /// + /// Relative to the control (percentage [0.0f to 1.0f] of the control). + /// Relative = 0, + /// + /// Absolute value in world units. + /// Absolute = 1 } @@ -1577,11 +1777,29 @@ namespace Tizen.NUI /// public enum VisualTransformPropertyType { + /// + /// Offset of the visual, which can be either relative (percentage [0.0f to 1.0f] of the parent) or absolute (in world units). + /// Offset, + /// + /// Size of the visual, which can be either relative (percentage [0.0f to 1.0f] of the parent) or absolute (in world units). + /// Size, + /// + /// The origin of the visual within its control area. + /// Origin, + /// + /// The anchor-point of the visual + /// AnchorPoint, + /// + /// Whether the x or y OFFSET values are relative (percentage [0.0f to 1.0f] of the control) or absolute (in world units). + /// OffsetPolicy, + /// + /// Whether the width or height SIZE values are relative (percentage [0.0f to 1.0f] of the control) or absolute (in world units). + /// SizePolicy } @@ -1590,18 +1808,54 @@ namespace Tizen.NUI /// public struct Visual { + /// + /// The index for the visual type. + /// public enum Type { + /// + /// Renders a solid color as an internal border to the control's quad. + /// Border, + /// + /// Renders a solid color to the control's quad. + /// Color, + /// + /// Renders a smooth transition of colors to the control's quad. + /// Gradient, + /// + /// Renders an image into the control's quad. + /// Image, + /// + /// Renders a mesh using an "obj" file, optionally with textures provided by an "mtl" file. + /// Mesh, + /// + /// Renders a simple 3D shape, such as a cube or sphere. + /// Primitive, + /// + /// Renders a simple wire-frame outlining a quad. + /// Wireframe, + /// + /// Renders text. + /// Text, + /// + /// Renders an n-patch image. + /// NPatch, + /// + /// Renders an SVG image. + /// SVG, + /// + /// Renders a animated image. (Animated GIF) + /// AnimatedImage } @@ -1615,6 +1869,7 @@ namespace Tizen.NUI 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 Opacity = NDalic.VISUAL_PROPERTY_MIX_COLOR + 1; } /// @@ -1793,6 +2048,10 @@ namespace Tizen.NUI _outputVisualMap = new PropertyMap(); _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.SVG)); if (_url != null) { _outputVisualMap.Add(ImageVisualProperty.URL, new PropertyValue(_url)); } + if (_shader != null) { _outputVisualMap.Add((int)Visual.Property.Shader, new PropertyValue(_shader)); } + if (_premultipliedAlpha != null) { _outputVisualMap.Add((int)Visual.Property.PremultipliedAlpha, new PropertyValue((bool)_premultipliedAlpha)); } + if (_mixColor != null) { _outputVisualMap.Add((int)Visual.Property.MixColor, new PropertyValue(_mixColor)); } + if (_opacity != null) { _outputVisualMap.Add((int)Visual.Property.Opacity, new PropertyValue((float)_opacity)); } } } @@ -1825,6 +2084,10 @@ namespace Tizen.NUI _outputVisualMap = new PropertyMap(); _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.AnimatedImage)); if (_url != null) { _outputVisualMap.Add(ImageVisualProperty.URL, new PropertyValue(_url)); } + if (_shader != null) { _outputVisualMap.Add((int)Visual.Property.Shader, new PropertyValue(_shader)); } + if (_premultipliedAlpha != null) { _outputVisualMap.Add((int)Visual.Property.PremultipliedAlpha, new PropertyValue((bool)_premultipliedAlpha)); } + if (_mixColor != null) { _outputVisualMap.Add((int)Visual.Property.MixColor, new PropertyValue(_mixColor)); } + if (_opacity != null) { _outputVisualMap.Add((int)Visual.Property.Opacity, new PropertyValue((float)_opacity)); } } } @@ -1929,14 +2192,13 @@ namespace Tizen.NUI string _str1 = _propertyIndex.Substring(0, 1); string _str2 = _propertyIndex.Substring(1); string _str = _str1.ToLower() + _str2; - - //dynamic _obj = (object)_destinationValue; + PropertyValue val = PropertyValue.CreateFromObject(_destinationValue); PropertyMap _transition = new PropertyMap(); _transition.Add("target", new PropertyValue(_target)); _transition.Add("property", new PropertyValue(_str)); - _transition.Add("targetValue", new PropertyValue(val)); + _transition.Add("targetValue", val); _transition.Add("animator", new PropertyValue(_animator)); _outputVisualMap = _transition; diff --git a/src/Tizen.NUI/src/public/Wheel.cs b/src/Tizen.NUI/src/public/Wheel.cs index 8ee1324..7378912 100755 --- a/src/Tizen.NUI/src/public/Wheel.cs +++ b/src/Tizen.NUI/src/public/Wheel.cs @@ -12,12 +12,8 @@ namespace Tizen.NUI { /// - /// The wheel event structure is used to store a wheel rolling, it facilitates - /// processing of the wheel rolling and passing to other libraries like Toolkit.
- ///
- /// There is a key modifier which relates to keys like alt, shift and control functions are - /// supplied to check if they have been pressed when the wheel is being rolled.
- ///
+ /// The wheel event structure is used to store a wheel rolling, it facilitates processing of the wheel rolling and passing to other libraries like Toolkit.
+ /// There is a key modifier which relates to keys like alt, shift and control functions are supplied to check if they have been pressed when the wheel is being rolled.
/// We support a mouse device and there may be another custom device that support the wheel event. The device type is specified as \e type.
/// The mouse wheel event can be sent to the specific actor but the custom wheel event will be sent to the stage.
///