*
*/
-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/animation/animation.h>
+// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/text-view/text-view.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
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:
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, const Vector4& color );
+ 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
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.
/**
* 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.
* 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 );
+ void SetCutPastePopupBorderColor( const Vector4& color );
/**
* Get the border color
* @return Vector4 the color of the border
*/
- const Vector4& GetCutPastePopUpBorderColor() const;
+ 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
* Set the icon color of the popup
* @param[in] color required color
*/
- void SetCutPastePopUpIconColor( const Vector4& color );
+ void SetCutPastePopupIconColor( const Vector4& color );
/**
* Get the popup icon color
* @return Vector4 the color of the popup icon
*/
- const Vector4& GetCutPastePopUpIconColor() const;
+ const Vector4& GetCutPastePopupIconColor() const;
/**
* Set the pressed icon color of the popup
* @param[in] color required color
*/
- void SetCutPastePopUpIconPressedColor( const Vector4& color );
+ void SetCutPastePopupIconPressedColor( const Vector4& color );
/**
* Get the popup pressed icon color
* @return Vector4 the color of the popup pressed icon
*/
- const Vector4& GetCutPastePopUpIconPressedColor();
+ const Vector4& GetCutPastePopupIconPressedColor();
/**
* Set the text color of the popup
* @param[in] color required color
*/
- void SetCutPastePopUpTextColor( const Vector4& color );
+ void SetCutPastePopupTextColor( const Vector4& color );
/**
* Get the popup text color
* @return Vector4 the color of the popup text
*/
- const Vector4& GetCutPastePopUpTextColor();
+ const Vector4& GetCutPastePopupTextColor();
/**
* Set the pressed text color of the popup
* @param[in] color required color
*/
- void SetCutPastePopUpTextPressedColor( const Vector4& color );
+ void SetCutPastePopupTextPressedColor( const Vector4& color );
/**
* Get the popup pressed text color
* @return Vector4 the color of the popup pressed text
*/
- const Vector4& GetCutPastePopUpTextPressedColor();
+ const Vector4& GetCutPastePopupTextPressedColor();
/**
* Get the Button Priority Position
void AddPopupOptions();
/**
- * Set Boundary that PopUp should stay within
- * @param[in] boundingRectangle coordinates of bounding box from Top Left
+ * Get Visible size of the Popup, excludes content that needs scrolling
+ * @return Vector3 size of Popup
*/
- void SetPopupBoundary( const Rect<float>& boundingRectangle );
+ const Vector3& GetVisibileSize() const;
/**
* Sets the positon of the PopUp tail relative to TextInput
- * @param position Position to set
+ * @param[in] position Position to set
+ * @param[in] yAxisFlip If tail should be flipped in y axis
*/
- void SetTailPosition( const Vector3& position );
+ void SetTailPosition( const Vector3& position, const bool yAxisFlip );
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.
void ApplyTailConstraint();
/**
- * Create a layer to hold the stencil
- * @param[in] size Size to of layer
+ * 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 );
+ void CreateLayer( const Vector2& size );
/**
* Create a stencil to clip the scroll view content
- * @param[in] size Size to of stencil
+ * @param[in] size of the stencil.
*/
void CreateStencil( const Vector2& size );
/**
* Create a scroll view to hold the popup buttons and allow scrolling if too many buttons to fit within the visible boundary
- * @param[in] scrollViewSize size of content of the scroll view which can exceed its visible size
- * @param[in] visibleSize size of the visible scroll view
*/
- void CreateScrollView( const Vector2& scrollViewSize, const Vector2& visibleSize );
+ void CreateScrollView();
/**
- * Removes Popup from the stage.
+ * Set the scroll view size and ruler.
+ * @param[in] visibleSize size of the visible scroll view
*/
- void RemoveFromStage();
+ void UpdateScrollViewRulerAndSize( const Vector2& visibleSize );
/**
* Called when a button is pressed in the Popup
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
- ImageActor mTailOutline; ///< The border/outline around the tail
+ 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.
- Vector3 mContentSize; ///< Size of Content (i.e. Buttons)
- ActorContainer mButtonContainer; ///< List of buttons added to popup.
+ 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
- Layer mLayer; ///< Layer to house the scroll view and stencil
std::vector<ButtonRequirement> 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 mCutPasteIconsColor; // Color of the popup icon.
- Vector4 mCutPasteIconsPressedColor; // Color of the popup icon when pressed.
- Vector4 mCutPasteTextsColor; // Color of the popup text.
- Vector4 mCutPasteTextsPressedColor; // Color of the popup text when pressed.
-
- Rect<float> mBoundingRect; // Boundary that Popup must stay within.
+ 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
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
};
projects / platform / core / uifw / dali-toolkit.git / blobdiff