X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Ftext-input%2Ftext-input-popup-impl.h;h=c7f0fc2d8f09331745210a52d45abe971e5682c7;hb=7e315a440bad7033d19fefa8f9952d625ee6f076;hp=81186dfd81edea7f2a3512b7e497e1588110c291;hpb=bb52eae847ee00d2caf94bc5e94111c7663b91ea;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h index 81186df..c7f0fc2 100644 --- a/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h +++ b/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h @@ -18,10 +18,14 @@ * */ -// INTERNAL INCLUDES -#include +// EXTERNAL INCLUDES +#include +#include +#include +// INTERNAL INCLUDES #include +#include namespace Dali { @@ -81,30 +85,30 @@ public: static const char* const SIGNAL_SHOW_FINISHED; // Popup Button Pressed - typedef SignalV2< bool( Toolkit::Button ) > PressedSignalV2; + typedef Signal< bool( Toolkit::Button ) > PressedSignalType; // Popup Hide Finished - typedef SignalV2< void( TextInputPopup& ) > HideFinishedSignalV2; + typedef Signal< void( TextInputPopup& ) > HideFinishedSignalType; // Popup Show Finished - typedef SignalV2< void( TextInputPopup& ) > ShowFinishedSignalV2; + typedef Signal< void( TextInputPopup& ) > ShowFinishedSignalType; /** * Signal emitted when the button is touched. */ - PressedSignalV2& PressedSignal(); + PressedSignalType& PressedSignal(); /** * Signal emitted when popup is completely hidden * @note Only occurs after a Show() call with animation enabled. */ - HideFinishedSignalV2& HideFinishedSignal(); + HideFinishedSignalType& HideFinishedSignal(); /** * Signal emitted when popup is completely shown * @note Only occurs after a Hide() call with animation enabled. */ - ShowFinishedSignalV2& ShowFinishedSignal(); + ShowFinishedSignalType& ShowFinishedSignal(); public: @@ -115,45 +119,45 @@ public: TextInputPopup(); /** - * @return The root actor of for this popup is returned. - */ - Actor Self(); - - /** * Clears popup options (popup no longer exists) */ void Clear(); /** * Create the label + * @return the newly created Image actor to be used as the icon + */ + ImageActor CreateOptionIcon( Image iconImage, const Vector4& color ); + + /** + * Create the caption * @param[in] styledCaption The text to be displayed * @return the newly created label */ - Toolkit::TextView CreateOptionText( const MarkupProcessor::StyledTextArray& styledCaption ); + Toolkit::TextView CreateOptionCaption( const std::string& caption, const Vector4& color ); /** - * Create the label - * @param[in] iconImage the image to be used - * @return the newly created Image actor to be used as the icon + * Creates and sets up the background */ - ImageActor CreateOptionIcon( Image iconImage ); + void CreateBackground(); /** - * Creates and sets up the popup background + * Create and set up the tail */ - void CreatePopUpBackground(); + void CreateTail(); /** * Create divider if multiple options + * @return Return a divider image actor */ - void CreateDivider(); + ImageActor CreateDivider(); /** - * Create a background to be used when button pressed + * Create a background to be used when option pressed * @param[in] requiredSize size Image actor should be * @return Returns an Image Actor to be used a pressed background */ - ImageActor CreatePressedBackground( const Vector3 requiredSize ); + ImageActor CreatePressedBackground( const Vector2& requiredSize ); /** * Creates a ordered vector of button options @@ -161,6 +165,14 @@ public: void CreateOrderedListOfOptions(); /** + * Get the TextSize after constrained by the Popup margins. + * @param[in] textSize Natural size of text + * @return Vector2 constrained text size. + * + */ + Vector2 GetConstrainedTextSize( const Vector2& textSize ); + + /** * Adds a popup option. * @note Creates popup frame if not already created. * @param[in] name The unique name for this option. @@ -180,16 +192,9 @@ public: /** * Shows the popup * @param[in] animate (optional) whether to animate popup to show state over time (i.e. tween). + * @param[in] target Actor to parent popup. */ - void Show(bool animate = true); - - /** - * Sets Alternative offset property. - * The alternative offset property is how much to move in the horizontal and vertical - * axes when the popup goes out of the screen on the left/right sides or top/bottom sides. - * @param[in] offset Vector holding the left/right offset (x) and top/bottom offset (y) - */ - void SetAlternativeOffset(Vector2 offset); + void Show( Actor target, bool animate = true ); /** * Returns the current state of the popup. @@ -207,32 +212,44 @@ public: * Set the Cut and Paste buttons color when in normal state * @param[in] color color to use */ - void SetCutPastePopUpColor( const Vector4& color ); + void SetCutPastePopupColor( const Vector4& color ); /** - * Get the set color of the Copy and Paste PopUp buttons + * Get the set color of the Copy and Paste Popup buttons * @return color */ - const Vector4& GetCutPastePopUpColor() const; + const Vector4& GetCutPastePopupColor() const; /** * Set the Cut and Paste button color when pressed. * @param[in] color color to use */ - void SetCutPastePopUpPressedColor( const Vector4& color ); + void SetCutPastePopupPressedColor( const Vector4& color ); /** * Get the Cut and Paste pressed button color. * @return color */ - const Vector4& GetCutPastePopUpPressedColor() const; + const Vector4& GetCutPastePopupPressedColor() const; + + /** + * Set the border color of the popup + * @param[in] color required color + */ + void SetCutPastePopupBorderColor( const Vector4& color ); + + /** + * Get the border color + * @return Vector4 the color of the border + */ + const Vector4& GetCutPastePopupBorderColor() const; /** * Toggle if a popup button should be enabled (shown) or not * @param[in] requiredButton Button Id to enable or disable * @param[in] enable toggle to enable (true) or disable (false) */ - void TogglePopUpButtonOnOff( TextInputPopup::Buttons requiredButton, bool enable ); + void TogglePopupButtonOnOff( TextInputPopup::Buttons requiredButton, bool enable ); /** * Set the Button Priority Position @@ -242,6 +259,54 @@ public: void SetButtonPriorityPosition( TextInputPopup::Buttons button, unsigned int priority ); /** + * Set the icon color of the popup + * @param[in] color required color + */ + void SetCutPastePopupIconColor( const Vector4& color ); + + /** + * Get the popup icon color + * @return Vector4 the color of the popup icon + */ + const Vector4& GetCutPastePopupIconColor() const; + + /** + * Set the pressed icon color of the popup + * @param[in] color required color + */ + void SetCutPastePopupIconPressedColor( const Vector4& color ); + + /** + * Get the popup pressed icon color + * @return Vector4 the color of the popup pressed icon + */ + const Vector4& GetCutPastePopupIconPressedColor(); + + /** + * Set the text color of the popup + * @param[in] color required color + */ + void SetCutPastePopupTextColor( const Vector4& color ); + + /** + * Get the popup text color + * @return Vector4 the color of the popup text + */ + const Vector4& GetCutPastePopupTextColor(); + + /** + * Set the pressed text color of the popup + * @param[in] color required color + */ + void SetCutPastePopupTextPressedColor( const Vector4& color ); + + /** + * Get the popup pressed text color + * @return Vector4 the color of the popup pressed text + */ + const Vector4& GetCutPastePopupTextPressedColor(); + + /** * Get the Button Priority Position * @param[in] button Button id to get priority of * @return the button priority, 1 is highest, 0 is not shown. @@ -253,6 +318,19 @@ public: */ void AddPopupOptions(); + /** + * Get Visible size of the Popup, excludes content that needs scrolling + * @return Vector3 size of Popup + */ + const Vector3& GetVisibileSize() const; + + /** + * Sets the positon of the PopUp tail relative to TextInput + * @param[in] position Position to set + * @param[in] yAxisFlip If tail should be flipped in y axis + */ + void SetTailPosition( const Vector3& position, const bool yAxisFlip ); + private: /** @@ -268,9 +346,15 @@ private: const std::string& name, const std::string& caption, Image iconImage, bool enabled ); /** - * Adds Popup to the stage (ideally on a separate top-most layer and as an overlay) + * @brief Adds popup to the given parent + * @paran[in] parent target to add Popup to */ - void AddToStage(); + void AddToParent( Actor parent ); + + /** + * @brief Removes Popup from Parent + */ + void RemoveFromParent(); /** * Applies constraint to keep Popup in view within the desired area. @@ -278,9 +362,44 @@ private: void ApplyConfinementConstraint(); /** - * Removes Popup from the stage. + * Applies constraint to keep the Tail attached to Popup + */ + void ApplyTailConstraint(); + + /** + * Create Layer to be used with stencil to allow scrolling of buttons which do not fit in visible popup + * @param[in] size of the layer. + */ + void CreateLayer( const Vector2& size ); + + /** + * Create a stencil to clip the scroll view content + * @param[in] size of the stencil. + */ + void CreateStencil( const Vector2& size ); + + /** + * Popup has started to scroll + * @param[in] position current scroll view position + */ + void OnScrollStarted( const Vector3& position ); + + /** + * Popup has stopped scrolling + * @param[in] position current scroll view position */ - void RemoveFromStage(); + void OnScrollCompleted( const Vector3& position ); + + /** + * Create a scroll view to hold the popup buttons and allow scrolling if too many buttons to fit within the visible boundary + */ + void CreateScrollView(); + + /** + * Set the scroll view size and ruler. + * @param[in] visibleSize size of the visible scroll view + */ + void UpdateScrollViewRulerAndSize( const Vector2& visibleSize ); /** * Called when a button is pressed in the Popup @@ -305,20 +424,35 @@ private: private: State mState; ///< Popup State. - Actor mRootActor; ///< The actor which all popup content is added to (i.e. panel and buttons) - Property::Index mAlternativeOffsetProperty; ///< Property [Vector3] how much to offset the popup if it goes out of the screen + Layer mRoot; ///< The actor which all popup content is added to (i.e. panel and buttons) + Actor mButtons; ///< Actor which holds all the buttons, sensitivity can be set on all buttons via this actor ImageActor mBackground; ///< The background popup panel + ImageActor mBackgroundEffect; ///< The background effect + ImageActor mBackgroundLine; ///< The background line ImageActor mTail; ///< The tail for the popup - Vector3 mContentSize; ///< Size of Content (i.e. Buttons) - ActorContainer mButtonContainer; ///< List of buttons added to popup. + ImageActor mTailEffect; ///< the tail effect + ImageActor mTailLine; ///< The border/outline around the tail + + Vector3 mVisiblePopUpSize; ///< Visible Size of Popup excluding content that needs scrolling. + float mPopupTailXPosition; ///< X position of PopUp tail. + + Vector2 mContentSize; ///< Size of Content (i.e. Buttons) ActorContainer mDividerContainer; ///< List of dividers added to popup. Animation mAnimation; ///< Popup Hide/Show animation. + Layer mLayer; ///< Layer to be used with Stencil + Actor mStencil; ///< Stencil to clip scrollview + Toolkit::ScrollView mScrollView; ///< Scrollview to house the popup + std::vector mOrderListOfButtons; // List of buttons in the order to be displayed and a flag to indicate if needed. - Vector4 mCutPasteButtonsColor; // Color of the cut and paste popup - Vector4 mCutPasteButtonsPressedColor; // Color of the cut and paste buttons when pressed. - Vector4 mBorderColor; // Color of the border around the Cut and Paste Popup + Vector4 mBackgroundColor; // Color of the background of the text input popup + Vector4 mBackgroundPressedColor; // Color of the option background. + Vector4 mLineColor; // Color of the line around the text input popup + Vector4 mIconColor; // Color of the popup icon. + Vector4 mIconPressedColor; // Color of the popup icon when pressed. + Vector4 mTextColor; // Color of the popup text. + Vector4 mTextPressedColor; // Color of the popup text when pressed. // Priority of Options/Buttons in the Cut and Paste pop-up, higher priority buttons are displayed first, left to right. std::size_t mSelectOptionPriority; // Position of Select Button @@ -328,9 +462,9 @@ private: std::size_t mPasteOptionPriority; // Position of Paste button std::size_t mClipboardOptionPriority; // Position of Clipboard button - PressedSignalV2 mPressedSignal; ///< Signal emitted when a button within the popup is pressed. - HideFinishedSignalV2 mHideFinishedSignal; ///< Signal emitted when popup is completely hidden - ShowFinishedSignalV2 mShowFinishedSignal; ///< Signal emitted when popup is completely shown + PressedSignalType mPressedSignal; ///< Signal emitted when a button within the popup is pressed. + HideFinishedSignalType mHideFinishedSignal; ///< Signal emitted when popup is completely hidden + ShowFinishedSignalType mShowFinishedSignal; ///< Signal emitted when popup is completely shown };