X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Ftext-input%2Ftext-input-popup-impl.h;h=4348ca8b3174bca981ef664ba9db09782fbaf608;hp=759c1045f7a1996574c62dcdc4db58c34bef539e;hb=138d00123ed6095e37951f7dc1c841c11a5adda3;hpb=4b8fe27c3ae38f993898b4f99e92de7b9f671601

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 759c104..4348ca8 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
@@ -162,6 +162,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.
@@ -186,14 +194,6 @@ public:
   void Show( Actor target, 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);
-
-  /**
    * Returns the current state of the popup.
    * @return The state of the popup see enum State
    */
@@ -316,12 +316,6 @@ public:
   void AddPopupOptions();
 
   /**
-   * Set Boundary that Popup should stay within
-   * @param[in] boundingRectangle coordinates of bounding box from Top Left
-   */
-  void SetPopupBoundary( const Rect<float>& boundingRectangle );
-
-  /**
    * Get Visible size of the Popup, excludes content that needs scrolling
    * @return Vector3 size of Popup
    */
@@ -370,6 +364,12 @@ private:
   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.
    */
@@ -421,7 +421,8 @@ private:
 private:
 
   State mState;                                       ///< Popup State.
-  Layer mRoot;                                       ///< The actor which all popup content is added to (i.e. panel and buttons)
+  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
@@ -433,10 +434,10 @@ private:
   float mPopupTailXPosition;                          ///< X position of PopUp tail.
 
   Vector2 mContentSize;                               ///< Size of Content (i.e. Buttons)
-  ActorContainer mButtonContainer;                    ///< List of buttons added to popup.
   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
 
@@ -450,8 +451,6 @@ private:
   Vector4 mTextColor;                    // Color of the popup text.
   Vector4 mTextPressedColor;             // Color of the popup text when pressed.
 
-  Rect<float> mBoundingRect; // Boundary that Popup must stay within.
-
   // 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 mSelectAllOptionPriority; // Position of Select All button