X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fdevel-api%2Factors%2Factor-devel.h;h=254ca39c7f0b4ac3dd784d343d554edce4b10dab;hb=63c292a68921d0087b9509933f838558c90e9e69;hp=20d136e52ee9ae75a7ec984e29c0afe58b1edb03;hpb=d08c943f03a8d4a6e76cfcf789048975a861b678;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/devel-api/actors/actor-devel.h b/dali/devel-api/actors/actor-devel.h index 20d136e..254ca39 100644 --- a/dali/devel-api/actors/actor-devel.h +++ b/dali/devel-api/actors/actor-devel.h @@ -32,60 +32,62 @@ namespace Property enum Type { - PARENT_ORIGIN = Dali::Actor::Property::PARENT_ORIGIN, - PARENT_ORIGIN_X = Dali::Actor::Property::PARENT_ORIGIN_X, - PARENT_ORIGIN_Y = Dali::Actor::Property::PARENT_ORIGIN_Y, - PARENT_ORIGIN_Z = Dali::Actor::Property::PARENT_ORIGIN_Z, - ANCHOR_POINT = Dali::Actor::Property::ANCHOR_POINT, - ANCHOR_POINT_X = Dali::Actor::Property::ANCHOR_POINT_X, - ANCHOR_POINT_Y = Dali::Actor::Property::ANCHOR_POINT_Y, - ANCHOR_POINT_Z = Dali::Actor::Property::ANCHOR_POINT_Z, - SIZE = Dali::Actor::Property::SIZE, - SIZE_WIDTH = Dali::Actor::Property::SIZE_WIDTH, - SIZE_HEIGHT = Dali::Actor::Property::SIZE_HEIGHT, - SIZE_DEPTH = Dali::Actor::Property::SIZE_DEPTH, - POSITION = Dali::Actor::Property::POSITION, - POSITION_X = Dali::Actor::Property::POSITION_X, - POSITION_Y = Dali::Actor::Property::POSITION_Y, - POSITION_Z = Dali::Actor::Property::POSITION_Z, - WORLD_POSITION = Dali::Actor::Property::WORLD_POSITION, - WORLD_POSITION_X = Dali::Actor::Property::WORLD_POSITION_X, - WORLD_POSITION_Y = Dali::Actor::Property::WORLD_POSITION_Y, - WORLD_POSITION_Z = Dali::Actor::Property::WORLD_POSITION_Z, - ORIENTATION = Dali::Actor::Property::ORIENTATION, - WORLD_ORIENTATION = Dali::Actor::Property::WORLD_ORIENTATION, - SCALE = Dali::Actor::Property::SCALE, - SCALE_X = Dali::Actor::Property::SCALE_X, - SCALE_Y = Dali::Actor::Property::SCALE_Y, - SCALE_Z = Dali::Actor::Property::SCALE_Z, - WORLD_SCALE = Dali::Actor::Property::WORLD_SCALE, - VISIBLE = Dali::Actor::Property::VISIBLE, - COLOR = Dali::Actor::Property::COLOR, - COLOR_RED = Dali::Actor::Property::COLOR_RED, - COLOR_GREEN = Dali::Actor::Property::COLOR_GREEN, - COLOR_BLUE = Dali::Actor::Property::COLOR_BLUE, - COLOR_ALPHA = Dali::Actor::Property::COLOR_ALPHA, - WORLD_COLOR = Dali::Actor::Property::WORLD_COLOR, - WORLD_MATRIX = Dali::Actor::Property::WORLD_MATRIX, - NAME = Dali::Actor::Property::NAME, - SENSITIVE = Dali::Actor::Property::SENSITIVE, - LEAVE_REQUIRED = Dali::Actor::Property::LEAVE_REQUIRED, - INHERIT_ORIENTATION = Dali::Actor::Property::INHERIT_ORIENTATION, - INHERIT_SCALE = Dali::Actor::Property::INHERIT_SCALE, - COLOR_MODE = Dali::Actor::Property::COLOR_MODE, - POSITION_INHERITANCE = Dali::Actor::Property::POSITION_INHERITANCE, - DRAW_MODE = Dali::Actor::Property::DRAW_MODE, - SIZE_MODE_FACTOR = Dali::Actor::Property::SIZE_MODE_FACTOR, - WIDTH_RESIZE_POLICY = Dali::Actor::Property::WIDTH_RESIZE_POLICY, - HEIGHT_RESIZE_POLICY = Dali::Actor::Property::HEIGHT_RESIZE_POLICY, - SIZE_SCALE_POLICY = Dali::Actor::Property::SIZE_SCALE_POLICY, - WIDTH_FOR_HEIGHT = Dali::Actor::Property::WIDTH_FOR_HEIGHT, - HEIGHT_FOR_WIDTH = Dali::Actor::Property::HEIGHT_FOR_WIDTH, - PADDING = Dali::Actor::Property::PADDING, - MINIMUM_SIZE = Dali::Actor::Property::MINIMUM_SIZE, - MAXIMUM_SIZE = Dali::Actor::Property::MAXIMUM_SIZE, - INHERIT_POSITION = Dali::Actor::Property::INHERIT_POSITION, - CLIPPING_MODE = Dali::Actor::Property::CLIPPING_MODE, + PARENT_ORIGIN = Dali::Actor::Property::PARENT_ORIGIN, + PARENT_ORIGIN_X = Dali::Actor::Property::PARENT_ORIGIN_X, + PARENT_ORIGIN_Y = Dali::Actor::Property::PARENT_ORIGIN_Y, + PARENT_ORIGIN_Z = Dali::Actor::Property::PARENT_ORIGIN_Z, + ANCHOR_POINT = Dali::Actor::Property::ANCHOR_POINT, + ANCHOR_POINT_X = Dali::Actor::Property::ANCHOR_POINT_X, + ANCHOR_POINT_Y = Dali::Actor::Property::ANCHOR_POINT_Y, + ANCHOR_POINT_Z = Dali::Actor::Property::ANCHOR_POINT_Z, + SIZE = Dali::Actor::Property::SIZE, + SIZE_WIDTH = Dali::Actor::Property::SIZE_WIDTH, + SIZE_HEIGHT = Dali::Actor::Property::SIZE_HEIGHT, + SIZE_DEPTH = Dali::Actor::Property::SIZE_DEPTH, + POSITION = Dali::Actor::Property::POSITION, + POSITION_X = Dali::Actor::Property::POSITION_X, + POSITION_Y = Dali::Actor::Property::POSITION_Y, + POSITION_Z = Dali::Actor::Property::POSITION_Z, + WORLD_POSITION = Dali::Actor::Property::WORLD_POSITION, + WORLD_POSITION_X = Dali::Actor::Property::WORLD_POSITION_X, + WORLD_POSITION_Y = Dali::Actor::Property::WORLD_POSITION_Y, + WORLD_POSITION_Z = Dali::Actor::Property::WORLD_POSITION_Z, + ORIENTATION = Dali::Actor::Property::ORIENTATION, + WORLD_ORIENTATION = Dali::Actor::Property::WORLD_ORIENTATION, + SCALE = Dali::Actor::Property::SCALE, + SCALE_X = Dali::Actor::Property::SCALE_X, + SCALE_Y = Dali::Actor::Property::SCALE_Y, + SCALE_Z = Dali::Actor::Property::SCALE_Z, + WORLD_SCALE = Dali::Actor::Property::WORLD_SCALE, + VISIBLE = Dali::Actor::Property::VISIBLE, + COLOR = Dali::Actor::Property::COLOR, + COLOR_RED = Dali::Actor::Property::COLOR_RED, + COLOR_GREEN = Dali::Actor::Property::COLOR_GREEN, + COLOR_BLUE = Dali::Actor::Property::COLOR_BLUE, + COLOR_ALPHA = Dali::Actor::Property::COLOR_ALPHA, + WORLD_COLOR = Dali::Actor::Property::WORLD_COLOR, + WORLD_MATRIX = Dali::Actor::Property::WORLD_MATRIX, + NAME = Dali::Actor::Property::NAME, + SENSITIVE = Dali::Actor::Property::SENSITIVE, + LEAVE_REQUIRED = Dali::Actor::Property::LEAVE_REQUIRED, + INHERIT_ORIENTATION = Dali::Actor::Property::INHERIT_ORIENTATION, + INHERIT_SCALE = Dali::Actor::Property::INHERIT_SCALE, + COLOR_MODE = Dali::Actor::Property::COLOR_MODE, + POSITION_INHERITANCE = Dali::Actor::Property::POSITION_INHERITANCE, + DRAW_MODE = Dali::Actor::Property::DRAW_MODE, + SIZE_MODE_FACTOR = Dali::Actor::Property::SIZE_MODE_FACTOR, + WIDTH_RESIZE_POLICY = Dali::Actor::Property::WIDTH_RESIZE_POLICY, + HEIGHT_RESIZE_POLICY = Dali::Actor::Property::HEIGHT_RESIZE_POLICY, + SIZE_SCALE_POLICY = Dali::Actor::Property::SIZE_SCALE_POLICY, + WIDTH_FOR_HEIGHT = Dali::Actor::Property::WIDTH_FOR_HEIGHT, + HEIGHT_FOR_WIDTH = Dali::Actor::Property::HEIGHT_FOR_WIDTH, + PADDING = Dali::Actor::Property::PADDING, + MINIMUM_SIZE = Dali::Actor::Property::MINIMUM_SIZE, + MAXIMUM_SIZE = Dali::Actor::Property::MAXIMUM_SIZE, + INHERIT_POSITION = Dali::Actor::Property::INHERIT_POSITION, + CLIPPING_MODE = Dali::Actor::Property::CLIPPING_MODE, + LAYOUT_DIRECTION = Dali::Actor::Property::LAYOUT_DIRECTION, + INHERIT_LAYOUT_DIRECTION = Dali::Actor::Property::INHERIT_LAYOUT_DIRECTION, /** * @brief Sets the sibling order of the actor so depth position can be defined within the same parent. @@ -94,20 +96,20 @@ enum Type * @note Raise, Lower, RaiseToTop, LowerToBottom, RaiseAbove and LowerBelow will override the * sibling order. The values set by this Property will likely change. */ - SIBLING_ORDER = CLIPPING_MODE + 1, + SIBLING_ORDER = INHERIT_LAYOUT_DIRECTION + 1, /** * @brief The opacity of the actor. * @details Name "opacity", type Property::FLOAT. */ - OPACITY = CLIPPING_MODE + 2, + OPACITY = INHERIT_LAYOUT_DIRECTION + 2, /** * @brief Returns the screen position of the Actor * @details Name "screenPosition", type Property::VECTOR2. Read-only * @note This assumes default camera and default render-task and the Z position is ZERO. */ - SCREEN_POSITION = CLIPPING_MODE + 3, + SCREEN_POSITION = INHERIT_LAYOUT_DIRECTION + 3, /** * @brief Determines whether the anchor point should be used to determine the position of the actor. @@ -116,19 +118,7 @@ enum Type * @note If false, then the top-left of the actor is used for the position. * @note Setting this to false will allow scaling or rotation around the anchor-point without affecting the actor's position. */ - POSITION_USES_ANCHOR_POINT = CLIPPING_MODE + 4, - - /** - * @brief The direction of layout. - * @details Name "layoutDirection", type Property::INTEGER, @see LayoutDirection::Type for supported values. - */ - LAYOUT_DIRECTION = CLIPPING_MODE + 5, - - /** - * @brief Determines whether child actors inherit the layout direction from a parent. - * @details Name "layoutDirectionInheritance", type Property::BOOLEAN. - */ - INHERIT_LAYOUT_DIRECTION = CLIPPING_MODE + 6 + POSITION_USES_ANCHOR_POINT = INHERIT_LAYOUT_DIRECTION + 4, }; } // namespace Property @@ -144,90 +134,8 @@ enum Type } // namespace VisibilityChange -namespace LayoutDirection -{ - -enum Type -{ - LTR, ///< Layout direction is from Left to Right direction. - RTL ///< Layout direction is from Right to Left direction. -}; - -} // namespace - typedef Signal< void ( Actor, bool, VisibilityChange::Type ) > VisibilityChangedSignalType; ///< Signal type of VisibilityChangedSignalType -typedef Signal< void ( Actor, LayoutDirection::Type ) > LayoutDirectionChangedSignalType; ///< Signal type of LayoutDirectionChangedSignal - -/** - * @brief Raise actor above the next highest level of actor(s). - * - * @param[in] actor The Actor to raise - * @note Sibling order of actors within the parent will be updated automatically. - * Using this API means a limit of DevelLayer::SIBLING_ORDER_MULTIPLIER Actors. - * 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. - * - */ -DALI_IMPORT_API void Raise( Actor actor ); - -/** - * @brief Lower the actor to underneath the level below actor(s). - * - * @param[in] actor The Actor to lower - * @note Sibling order of actors within the parent will be updated automatically. - * Using this API means a limit of DevelLayer::SIBLING_ORDER_MULTIPLIER Actors. - * 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. - */ -DALI_IMPORT_API void Lower( Actor actor ); - -/** - * @brief Raise actor above all other actors. - * - * @param[in] actor The Actor to raise to the top - * @note Sibling order of actors within the parent will be updated automatically. - * Using this API means a limit of DevelLayer::SIBLING_ORDER_MULTIPLIER Actors. - * Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion. - */ -DALI_IMPORT_API void RaiseToTop( Actor actor ); - -/** - * @brief Lower actor to the bottom of all actors. - * - * @param[in] actor The Actor to lower to the bottom - * @note Sibling order of actors within the parent will be updated automatically. - * Using this API means a limit of DevelLayer::SIBLING_ORDER_MULTIPLIER Actors. - * Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion. - */ -DALI_IMPORT_API void LowerToBottom( Actor actor ); - -/** - * @brief Raise the actor to above the target actor. - * - * @param[in] actor The actor to raise - * @param[in] target Will be raised above this 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. - * Using this API means a limit of DevelLayer::SIBLING_ORDER_MULTIPLIER Actors. - * Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion. - */ -DALI_IMPORT_API void RaiseAbove( Actor actor, Dali::Actor target ); - -/** - * @brief Lower the actor to below the target actor. - * - * @param[in] actor The Actor to lower - * @param[in] target Will be lowered below this actor - * @note Sibling order of actors within the parent will be updated automatically. - * Using this API means a limit of DevelLayer::SIBLING_ORDER_MULTIPLIER Actors. - * 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. - */ -DALI_IMPORT_API void LowerBelow( Actor actor, Dali::Actor target ); - /** * @brief This signal is emitted when the visible property of this or a parent actor is changed. * @@ -244,20 +152,6 @@ DALI_IMPORT_API void LowerBelow( Actor actor, Dali::Actor target ); */ DALI_IMPORT_API VisibilityChangedSignalType& VisibilityChangedSignal( Actor actor ); -/** - * @brief This signal is emitted when the layout direction property of this or a parent actor is changed. - * - * A callback of the following type may be connected: - * @code - * void YourCallbackName( Actor actor, LayoutDirection::Type type ); - * @endcode - * actor: The actor, or child of actor, whose laytou direction has changed - * type: Whether the actor's layout direction property has changed or a parent's. - * @return The signal to connect to - * @pre The Actor has been initialized. - */ -DALI_IMPORT_API LayoutDirectionChangedSignalType& LayoutDirectionChangedSignal( Actor actor ); - } // namespace DevelActor } // namespace Dali