[dali_1.1.19] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / text-controls / text-selection-popup-impl.cpp

diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
index 6c69704..61388ac 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
@@ -18,13 +18,9 @@
 // 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>
@@ -34,8 +30,11 @@
 #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/default-controls/solid-color-actor.h>
+#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
 {
@@ -356,7 +355,8 @@ void TextSelectionPopup::RaiseAbove( Layer target )
 
 void TextSelectionPopup::ShowPopup()
 {
-  if ( !mPopupShowing || mButtonsChanged )
+  if( ( !mPopupShowing || mButtonsChanged ) &&
+      ( Toolkit::TextSelectionPopup::NONE != mEnabledButtons ) )
   {
     Actor self = Self();
     AddPopupOptionsToToolbar( mShowIcons, mShowCaptions );
@@ -736,14 +736,13 @@ std::string TextSelectionPopup::GetPressedImage() const
    {
      const Size size( mOptionDividerSize.width, 0.0f ); // Height FILL_TO_PARENT
 
-     ImageActor divider = Toolkit::CreateSolidColorActor( Color::WHITE );
+     Toolkit::Control divider = Toolkit::Control::New();
 #ifdef DECORATOR_DEBUG
      divider.SetName("Text's popup divider");
 #endif
      divider.SetSize( size );
      divider.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT );
-     divider.SetColor( mDividerColor );
-     divider.SetSortModifier( DECORATION_DEPTH_INDEX );
+     divider.SetBackgroundColor( mDividerColor  );
      mToolbar.AddDivider( divider );
    }
  }