// CLASS HEADER
#include <dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h>
-// INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.h>
-#include <dali-toolkit/public-api/controls/control-depth-index-ranges.h>
-#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
-#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
-
// EXTERNAL INCLUDES
+#include <libintl.h>
+#include <cfloat>
#include <dali/public-api/animation/animation.h>
#include <dali/public-api/images/nine-patch-image.h>
#include <dali/public-api/images/resource-image.h>
#include <dali/devel-api/object/type-registry-helper.h>
#include <dali/integration-api/debug.h>
-#include <libintl.h>
-#include <cfloat>
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
+#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.h>
namespace Dali
{
namespace
{
// todo Move this to adaptor??
-#define GET_LOCALE_TEXT(string) dgettext("sys_string", string)
+#define GET_LOCALE_TEXT(string) dgettext("dali-toolkit", string)
const std::string TEXT_SELECTION_POPUP_BUTTON_STYLE_NAME( "textselectionpopupbutton" );
const Dali::Vector4 DEFAULT_OPTION_PRESSED_COLOR( Dali::Vector4( 0.24f, 0.72f, 0.8f, 1.0f ) );
void TextSelectionPopup::ShowPopup()
{
- if ( !mPopupShowing || mButtonsChanged )
+ if( ( !mPopupShowing || mButtonsChanged ) &&
+ ( Toolkit::TextSelectionPopup::NONE != mEnabledButtons ) )
{
Actor self = Self();
AddPopupOptionsToToolbar( mShowIcons, mShowCaptions );