(PanGestures)PropertyOwner.ResetDefaultProperties is now called on PanGestures

[Issue#]   N/A
[Problem]  PanGesture properties were never being reset and so would cause constraints to be updated every update frame
[Cause]
[Solution] Implemented ResetDefaultProperties

Signed-off-by: Paul Wisbey <p.wisbey@samsung.com>

diff --git a/dali/internal/update/gestures/gesture-properties.h b/dali/internal/update/gestures/gesture-properties.h
index 1e707ff..c6b079c 100644 (file)
--- a/dali/internal/update/gestures/gesture-properties.h
+++ b/dali/internal/update/gestures/gesture-properties.h
@@ -100,6 +100,14 @@ public:
   }
 
   /**
+   * @brief Resets mInputChanged back to false
+   */
+  void Reset()
+  {
+    mInputChanged = false;
+  }
+
+  /**
    * Set the property value.
    * @param[in] value The new property value.
    */

diff --git a/dali/internal/update/gestures/scene-graph-pan-gesture.cpp b/dali/internal/update/gestures/scene-graph-pan-gesture.cpp
index 19422d9..a5f6631 100644 (file)
--- a/dali/internal/update/gestures/scene-graph-pan-gesture.cpp
+++ b/dali/internal/update/gestures/scene-graph-pan-gesture.cpp
@@ -123,7 +123,10 @@ const GesturePropertyVector2& PanGesture::GetLocalDisplacementProperty() const
 
 void PanGesture::ResetDefaultProperties( BufferIndex updateBufferIndex )
 {
-  // Nothing to do
+  mScreenPosition.Reset();
+  mScreenDisplacement.Reset();
+  mLocalPosition.Reset();
+  mLocalDisplacement.Reset();
 }
 
 PanGesture::PanGesture()

diff --git a/dali/internal/update/manager/update-manager.cpp b/dali/internal/update/manager/update-manager.cpp
index 921030b..8ef61fa 100644 (file)
--- a/dali/internal/update/manager/update-manager.cpp
+++ b/dali/internal/update/manager/update-manager.cpp
@@ -785,12 +785,18 @@ void UpdateManager::ResetProperties()
     (*iter)->ResetToBaseValues( mSceneGraphBuffers.GetUpdateBufferIndex() );
   }
 
-  // Reset animatable animatable mesh properties to base values
+  // Reset animatable mesh properties to base values
   for ( AnimatableMeshIter iter = mImpl->animatableMeshes.Begin(); iter != mImpl->animatableMeshes.End(); ++iter )
   {
     (*iter)->ResetToBaseValues( mSceneGraphBuffers.GetUpdateBufferIndex() );
   }
 
+  // Reset gesture properties to base values
+  for ( GestureIter iter = mImpl->gestures.Begin(); iter != mImpl->gestures.End(); ++iter )
+  {
+    (*iter)->ResetToBaseValues( mSceneGraphBuffers.GetUpdateBufferIndex() );
+  }
+
   PERF_MONITOR_END(PerformanceMonitor::RESET_PROPERTIES);
 }