From c49a2ea2fc74c4299e4e85a80b7b6cb042ebbedc Mon Sep 17 00:00:00 2001 From: Victor Cebollada Date: Mon, 25 Jan 2016 14:41:05 +0000 Subject: [PATCH] Fix for text's popup. -Do not show the text's popup when none of the buttons are active. Change-Id: I9e080c446ac185cdd86a46885389a834be73cc89 Signed-off-by: Victor Cebollada --- .../internal/controls/text-controls/text-selection-popup-impl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 c19b920..61388ac 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp @@ -355,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 ); -- 2.7.4