X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fcontrol-devel.h;h=c56f7ce48ad967e9898906e68530affc096c654a;hb=e40f95b837ab8e9f1ce9094ebf4e6ac781e7bf6f;hp=233ef12fdd9bbad9521d1da785fc384ed39fa3b3;hpb=eb3641c5f89d0ad118aff7862b1e7669ea9828d9;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/controls/control-devel.h b/dali-toolkit/devel-api/controls/control-devel.h old mode 100644 new mode 100755 index 233ef12..c56f7ce --- a/dali-toolkit/devel-api/controls/control-devel.h +++ b/dali-toolkit/devel-api/controls/control-devel.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_CONTROL_DEVEL_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,9 +17,12 @@ * limitations under the License. * */ +// EXTERNAL INCLUDES +#include // INTERNAL INCLUDES #include +#include namespace Dali { @@ -54,6 +57,8 @@ enum BACKGROUND_IMAGE = Control::Property::BACKGROUND_IMAGE, KEY_INPUT_FOCUS = Control::Property::KEY_INPUT_FOCUS, BACKGROUND = Control::Property::BACKGROUND, + MARGIN = Control::Property::MARGIN, + PADDING = Control::Property::PADDING, /** * @brief Displays a tooltip when the control is hovered over. @@ -66,7 +71,7 @@ enum * @note When retrieved, a Property::MAP is returned. * @see Toolkit::Tooltip */ - TOOLTIP = BACKGROUND + 1, + TOOLTIP = PADDING + 1, /** * @brief The current state of the control. @@ -74,7 +79,7 @@ enum * * @see DevelControl::State */ - STATE = BACKGROUND + 2, + STATE = PADDING + 2, /** * @brief The current sub state of the control. @@ -82,62 +87,39 @@ enum * * @see DevelControl::State */ - SUB_STATE = BACKGROUND + 3, + SUB_STATE = PADDING + 3, /** * @brief The actor ID of the left focusable control. * @details Name "leftFocusableActorId", type Property::INTEGER. * */ - LEFT_FOCUSABLE_ACTOR_ID = BACKGROUND + 4, + LEFT_FOCUSABLE_ACTOR_ID = PADDING + 4, /** * @brief The actor ID of the right focusable control. * @details Name "rightFocusableActorId", type Property::INTEGER. * */ - RIGHT_FOCUSABLE_ACTOR_ID = BACKGROUND + 5, + RIGHT_FOCUSABLE_ACTOR_ID = PADDING + 5, /** * @brief The actor ID of the up focusable control. * @details Name "upFocusableActorId", type Property::INTEGER. * */ - UP_FOCUSABLE_ACTOR_ID = BACKGROUND + 6, + UP_FOCUSABLE_ACTOR_ID = PADDING + 6, /** * @brief The actor ID of the down focusable control. * @details Name "downFocusableActorId", type Property::INTEGER. * */ - DOWN_FOCUSABLE_ACTOR_ID = BACKGROUND + 7 + DOWN_FOCUSABLE_ACTOR_ID = PADDING + 7 }; } // namespace Property -/// @brief ResourceReady signal type; -typedef Signal ResourceReadySignalType; - -/** - * @brief This signal is emitted after all resources required - * by a control are loaded and ready. - * Most resources are only loaded when the control is placed on stage. - * - * A callback of the following type may be connected: - * @code - * void YourCallbackName( Control control ); - * @endcode - */ -DALI_IMPORT_API ResourceReadySignalType& ResourceReadySignal( Control& control ); - -/** - * @brief Query if all resources required by a control are loaded and ready. - * Most resources are only loaded when the control is placed on stage. - * @return true if the resources are loaded and ready, false otherwise - * - */ -DALI_IMPORT_API bool IsResourceReady( const Control& control ); - /** * @brief Register a visual by Property Index. * @@ -150,7 +132,7 @@ DALI_IMPORT_API bool IsResourceReady( const Control& control ); * @note If the depth-index is not set on the visual, then it is set to be above the currently registered visuals. * @note If replacing a visual, then the depth-index of the visual being replaced is used for the visual. */ -DALI_IMPORT_API void RegisterVisual( Internal::Control& control, Dali::Property::Index index, Toolkit::Visual::Base& visual ); +DALI_TOOLKIT_API void RegisterVisual( Internal::Control& control, Dali::Property::Index index, Toolkit::Visual::Base& visual ); /** * @brief Register a visual by Property Index with a depth index. @@ -166,7 +148,7 @@ DALI_IMPORT_API void RegisterVisual( Internal::Control& control, Dali::Property: * @see Visual::Base::GetDepthIndex() * @see Visual::Base::SetDepthIndex() */ -DALI_IMPORT_API void RegisterVisual( Internal::Control& control, Dali::Property::Index index, Toolkit::Visual::Base& visual, int depthIndex ); +DALI_TOOLKIT_API void RegisterVisual( Internal::Control& control, Dali::Property::Index index, Toolkit::Visual::Base& visual, int depthIndex ); /** * @brief Register a visual by Property Index with the option of enabling/disabling it. @@ -181,7 +163,7 @@ DALI_IMPORT_API void RegisterVisual( Internal::Control& control, Dali::Property: * * @see EnableVisual() */ -DALI_IMPORT_API void RegisterVisual( Internal::Control& control, Dali::Property::Index index, Toolkit::Visual::Base& visual, bool enabled ); +DALI_TOOLKIT_API void RegisterVisual( Internal::Control& control, Dali::Property::Index index, Toolkit::Visual::Base& visual, bool enabled ); /** * @brief Register a visual by Property Index with a depth index with the option of enabling/disabling it. @@ -196,7 +178,7 @@ DALI_IMPORT_API void RegisterVisual( Internal::Control& control, Dali::Property: * @see Visual::Base::GetDepthIndex() * @see Visual::Base::SetDepthIndex() */ -DALI_IMPORT_API void RegisterVisual( Internal::Control& control, Dali::Property::Index index, Toolkit::Visual::Base& visual, bool enabled, int depthIndex ); +DALI_TOOLKIT_API void RegisterVisual( Internal::Control& control, Dali::Property::Index index, Toolkit::Visual::Base& visual, bool enabled, int depthIndex ); /** * @brief Erase the entry matching the given index from the list of registered visuals @@ -204,7 +186,7 @@ DALI_IMPORT_API void RegisterVisual( Internal::Control& control, Dali::Property: * @param[in] control The control * @param[in] index The Property index of the visual, used to reference visual */ -DALI_IMPORT_API void UnregisterVisual( Internal::Control& control, Dali::Property::Index index ); +DALI_TOOLKIT_API void UnregisterVisual( Internal::Control& control, Dali::Property::Index index ); /** * @brief Retrieve the visual associated with the given property index. @@ -214,7 +196,7 @@ DALI_IMPORT_API void UnregisterVisual( Internal::Control& control, Dali::Propert * @return The registered visual if exist, otherwise empty handle. * @note For managing object life-cycle, do not store the returned visual as a member which increments its reference count. */ -DALI_IMPORT_API Toolkit::Visual::Base GetVisual( const Internal::Control& control, Dali::Property::Index index ); +DALI_TOOLKIT_API Toolkit::Visual::Base GetVisual( const Internal::Control& control, Dali::Property::Index index ); /** * @brief Sets the given visual to be displayed or not when parent staged. @@ -223,7 +205,7 @@ DALI_IMPORT_API Toolkit::Visual::Base GetVisual( const Internal::Control& contro * @param[in] index The Property index of the visual * @param[in] enable flag to set enabled or disabled. */ -DALI_IMPORT_API void EnableVisual( Internal::Control& control, Dali::Property::Index index, bool enable ); +DALI_TOOLKIT_API void EnableVisual( Internal::Control& control, Dali::Property::Index index, bool enable ); /** * @brief Queries if the given visual is to be displayed when parent staged. @@ -232,7 +214,7 @@ DALI_IMPORT_API void EnableVisual( Internal::Control& control, Dali::Property::I * @param[in] index The Property index of the visual * @return bool whether visual is enabled or not */ -DALI_IMPORT_API bool IsVisualEnabled( const Internal::Control& control, Dali::Property::Index index ); +DALI_TOOLKIT_API bool IsVisualEnabled( const Internal::Control& control, Dali::Property::Index index ); /** * @brief Create a transition effect on the control. @@ -247,7 +229,27 @@ DALI_IMPORT_API bool IsVisualEnabled( const Internal::Control& control, Dali::Pr * @return A handle to an animation defined with the given effect, or an empty * handle if no properties match. */ -DALI_IMPORT_API Dali::Animation CreateTransition( Internal::Control& control, const Toolkit::TransitionData& transitionData ); +DALI_TOOLKIT_API Dali::Animation CreateTransition( Internal::Control& control, const Toolkit::TransitionData& transitionData ); + +/** + * @brief Perform an action on a visual registered to this control. + * + * Visuals will have actions, this API is used to perform one of these actions with the given attributes. + * + * @param[in] control The control. + * @param[in] visualIndex The Property index of the visual. + * @param[in] actionId The action to perform. See Visual to find supported actions. + * @param[in] attributes Optional attributes for the action. + */ +DALI_TOOLKIT_API void DoAction( Control& control, Dali::Property::Index visualIndex, Dali::Property::Index actionId, const Dali::Property::Value attributes ); + +/** + * @brief Set input method context. + * + * @param[in] control The control. + * @param[in] inputMethodContext The input method context. + */ +DALI_TOOLKIT_API void SetInputMethodContext( Internal::Control& control, InputMethodContext& inputMethodContext ); } // namespace DevelControl