Determines whether to propagate pan gestures in text fields and editors.

Change-Id: I3cb8ae7710deca1bf9fbe886122a69a35c76df74

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 43a58842abdda504337b2f7e860645d429890efa..fdca0ea592ca4b51d9feb862cdf84c03c160698a 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
@@ -912,11 +912,15 @@ void TextEditor::OnTap(const TapGesture& gesture)
 
 void TextEditor::OnPan(const PanGesture& gesture)
 {
-  mController->PanEvent(gesture.GetState(), gesture.GetDisplacement());
-  if(gesture.GetState() == GestureState::STARTED && !mController->IsScrollable(gesture.GetDisplacement()))
+  if(!mController->IsScrollable(gesture.GetDisplacement()))
   {
     Dali::DevelActor::SetNeedGesturePropagation(Self(), true);
   }
+  else
+  {
+    Dali::DevelActor::SetNeedGesturePropagation(Self(), false);
+  }
+  mController->PanEvent(gesture.GetState(), gesture.GetDisplacement());
 }
 
 void TextEditor::OnLongPress(const LongPressGesture& gesture)

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 8336b14353edc90bf690c0c58a3b894cf941292f..95141afde38e98c637c5d6aa344a31232cf0f940 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
@@ -819,11 +819,15 @@ void TextField::OnTap(const TapGesture& gesture)
 
 void TextField::OnPan(const PanGesture& gesture)
 {
-  mController->PanEvent(gesture.GetState(), gesture.GetDisplacement());
-  if(gesture.GetState() == GestureState::STARTED && !mController->IsScrollable(gesture.GetDisplacement()))
+  if(!mController->IsScrollable(gesture.GetDisplacement()))
   {
     Dali::DevelActor::SetNeedGesturePropagation(Self(), true);
   }
+  else
+  {
+    Dali::DevelActor::SetNeedGesturePropagation(Self(), false);
+  }
+  mController->PanEvent(gesture.GetState(), gesture.GetDisplacement());
 }
 
 void TextField::OnLongPress(const LongPressGesture& gesture)