From: Adeel Kazmi Date: Mon, 20 Mar 2017 12:11:39 +0000 (-0700) Subject: Merge "Change the double tap and long press events on top of no text actions to highl... X-Git-Tag: dali_1.2.32~9 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=7f0a28e0f0da67178997e5a647bdc471e8dcb652;hp=e40a68da97d5a5564be9a194c4e02949ad5313cb Merge "Change the double tap and long press events on top of no text actions to highlight." into devel/master --- diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp index 5e2de42..fc86c7e 100644 --- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp @@ -1037,6 +1037,9 @@ void TextEditor::OnInitialize() // Enable the smooth handle panning. mController->SetSmoothHandlePanEnabled( true ); + mController->SetNoTextDoubleTapAction( Controller::NoTextTap::HIGHLIGHT ); + mController->SetNoTextLongPressAction( Controller::NoTextTap::HIGHLIGHT ); + // Forward input events to controller EnableGestureDetection( static_cast( Gesture::Tap | Gesture::Pan | Gesture::LongPress ) ); GetTapGestureDetector().SetMaximumTapsRequired( 2 ); diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp index 240dfde..bafa08e 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -1162,8 +1162,8 @@ void TextField::OnInitialize() // Disable the smooth handle panning. mController->SetSmoothHandlePanEnabled( false ); - mController->SetNoTextDoubleTapAction( Controller::NoTextTap::NO_ACTION ); - mController->SetNoTextLongPressAction( Controller::NoTextTap::SHOW_SELECTION_POPUP ); + mController->SetNoTextDoubleTapAction( Controller::NoTextTap::HIGHLIGHT ); + mController->SetNoTextLongPressAction( Controller::NoTextTap::HIGHLIGHT ); // Forward input events to controller EnableGestureDetection( static_cast( Gesture::Tap | Gesture::Pan | Gesture::LongPress ) );