X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-selection-popup-impl.h;h=4444d0ca58385e7576ddd035b0bc1ad6f21079c9;hb=bd4f4c078bc02ca029fdbef266f6e7b5b79650e2;hp=8e0141a31e3559aa019eb0b4aef073a4f2d935dd;hpb=06e563f8a982e25a0efe2d91c794657dc8e4bc4a;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h
index 8e0141a..4444d0c 100644
--- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h
@@ -38,9 +38,6 @@ namespace Toolkit
 namespace Internal
 {
 
-namespace
-{
-
 enum PopupCustomisations
 {
   POPUP_MAXIMUM_SIZE,
@@ -49,8 +46,6 @@ enum PopupCustomisations
   OPTION_DIVIDER_SIZE
 };
 
-} // namespace
-
 class TextSelectionPopup : public Control
 {
 public:
@@ -97,12 +92,10 @@ public:
 
   /**
    * @brief New constructor with provided buttons to enable.
-   * @param[in] buttonsToEnable bit mask of buttons to enable
    * @param[in] callbackInterface The text popup callback interface which receives the button click callbacks.
    * @return A handle to the TextSelectionPopup control.
    */
-  static Toolkit::TextSelectionPopup New( Toolkit::TextSelectionPopup::Buttons buttonsToEnable,
-                                          TextSelectionPopupCallbackInterface* callbackInterface );
+  static Toolkit::TextSelectionPopup New( TextSelectionPopupCallbackInterface* callbackInterface );
 
   // Properties
 
@@ -124,6 +117,11 @@ public:
   static Property::Value GetProperty( BaseObject* object, Property::Index index );
 
   /**
+   * @copydoc Toolkit::EnableButtons
+   */
+  void EnableButtons( Toolkit::TextSelectionPopup::Buttons buttonsToEnable );
+
+  /**
    * @copydoc Toolkit::TextSelectionPopup::RaiseAbove()
    */
   void RaiseAbove( Layer target );
@@ -133,6 +131,11 @@ public:
    */
   void ShowPopup();
 
+  /**
+   * @copydoc Toolkiut::TextSelectionPopup::HidePopup()
+   */
+  void HidePopup();
+
 private: // From Control
 
   /**
@@ -147,6 +150,8 @@ private: // From Control
 
 private: // Implementation
 
+  void HideAnimationFinished( Animation& animation );
+
   /**
    * @brief When the cut button is pressed.
    * @param[in] button the button pressed
@@ -242,8 +247,6 @@ private: // Implementation
 
   void AddPopupOptionsToToolbar(  bool showIcons, bool showCaptions );
 
-  void CreatePopup();
-
   /**
    * Construct a new TextField.
    */
@@ -275,6 +278,7 @@ private: // Data
   Image mSelectIconImage;
   Image mSelectAllIconImage;
 
+  Size mPopupMaxSize;                   // Maximum size of the Popup
   Size mOptionMaxSize;                  // Maximum size of an Option button
   Size mOptionMinSize;                  // Minimum size of an Option button
   Size mOptionDividerSize;              // Size of divider line
@@ -296,9 +300,13 @@ private: // Data
   std::size_t mCopyOptionPriority;      // Position of Copy button
   std::size_t mPasteOptionPriority;     // Position of Paste button
   std::size_t mClipboardOptionPriority; // Position of Clipboard button
+  float mFadeInDuration;                // Duration of the animation to fade in the Popup
+  float mFadeOutDuration;               // Duration of the animation to fade out the Popup
 
   bool mShowIcons:1; // Flag to show icons
   bool mShowCaptions:1; // Flag to show text captions
+  bool mPopupShowing:1; // Flag to indicate Popup showing
+  bool mButtonsChanged:1; // Flag to indicate the Popup Buttons have changed
 
 };