X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-selection-popup-impl.h;h=892c563269467908fd5a759ae7e830d07dfa1f50;hb=385a58a746d2481d4725b3018e6ebf5949aab6ee;hp=2650c57808f11db6c0734fda1572d8168118159e;hpb=08563381e540b243e31b03c45d74ce49258cd730;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 2650c57..892c563 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
@@ -20,7 +20,8 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/text-controls/text-selection-popup.h>
+#include <dali-toolkit/public-api/controls/table-view/table-view.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/actors/image-actor.h>
@@ -119,7 +120,6 @@ public:
 
   /**
    * @brief Called when a property of an object of this type is set.
-   *
    * @param[in] object The object whose property is set.
    * @param[in] index The property index.
    * @param[in] value The new property value.
@@ -159,7 +159,7 @@ private: // From Control
   /**
    * @copydoc Control::OnInitialize()
    */
-  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
+  virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
 //
 //  /**
 //   * Received for single & double taps
@@ -203,11 +203,11 @@ private: // From Control
 
   void CreateBackground();
 
-  void AddOption( Actor& parent, const std::string& name, const std::string& caption, const Image iconImage, bool finalOption, bool showIcons );
+  void AddOption( Dali::Toolkit::TableView& parent, const std::string& name, const std::string& caption, const Image iconImage, bool finalOption, bool showIcons, bool showCaption, std::size_t& indexInTable  );
 
-  void SetUpPopup( Size& size );
+  void SetUpPopup();
 
-  void AddPopupOptions( bool createTail, bool showIcons );
+  void AddPopupOptions( bool createTail, bool showIcons, bool showCaptions );
 
 private: // Implementation
 
@@ -229,7 +229,7 @@ private:
 
 private: // Data
 
-  Actor mButtons;                                     // Actor which holds all the buttons, sensitivity can be set oActor buttons via this actor
+  Dali::Toolkit::TableView mTableOfButtons;                          // Actor which holds all the buttons, sensitivity can be set on buttons via this actor
   Layer mStencilLayer;                                // Layer to enable clipping when buttons exceed popup
 
   // Images to be used by the Popup
@@ -274,6 +274,7 @@ private: // Data
   std::size_t mClipboardOptionPriority; // Position of Clipboard button
 
   bool mShowIcons; // Flag to show icons
+  bool mShowCaptions; // Flag to show text captions
 
 };