Updates after the use of const refs in gesture callbacks

Change-Id: I40f12f4bff328bec75601bc4ba13920530e317e3

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
index 49fe95b..7f784b6 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
@@ -114,10 +114,10 @@ DummyControlImplOverride::~DummyControlImplOverride() { }
 void DummyControlImplOverride::OnInitialize() { initializeCalled = true; }
 void DummyControlImplOverride::OnThemeChange(StyleManager change) { themeChangeCalled = true;}
 void DummyControlImplOverride::OnFontChange(bool defaultFontChange, bool defaultFontSizeChange) { fontChangeCalled = true; }
-void DummyControlImplOverride::OnPinch(PinchGesture pinch) { pinchCalled = true; }
-void DummyControlImplOverride::OnPan(PanGesture pan) { panCalled = true; }
-void DummyControlImplOverride::OnTap(TapGesture tap) { tapCalled = true; }
-void DummyControlImplOverride::OnLongPress(LongPressGesture longPress) { longPressCalled = true; }
+void DummyControlImplOverride::OnPinch(const PinchGesture& pinch) { pinchCalled = true; }
+void DummyControlImplOverride::OnPan(const PanGesture& pan) { panCalled = true; }
+void DummyControlImplOverride::OnTap(const TapGesture& tap) { tapCalled = true; }
+void DummyControlImplOverride::OnLongPress(const LongPressGesture& longPress) { longPressCalled = true; }
 void DummyControlImplOverride::OnStageConnection() { stageConnectionCalled = true; }
 void DummyControlImplOverride::OnStageDisconnection() { stageDisconnectionCalled = true; }
 void DummyControlImplOverride::OnChildAdd(Actor& child) { childAddCalled = true; }

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
index 0ebf48c..96f10b2 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
@@ -105,10 +105,10 @@ private: // From Internal::Control
   virtual void OnInitialize();
   virtual void OnThemeChange( StyleManager styleManager );
   virtual void OnFontChange(bool defaultFontChange, bool defaultFontSizeChange);
-  virtual void OnPinch(PinchGesture pinch);
-  virtual void OnPan(PanGesture pan);
-  virtual void OnTap(TapGesture tap);
-  virtual void OnLongPress(LongPressGesture longPress);
+  virtual void OnPinch(const PinchGesture& pinch);
+  virtual void OnPan(const PanGesture& pan);
+  virtual void OnTap(const TapGesture& tap);
+  virtual void OnLongPress(const LongPressGesture& longPress);
 
 private: // From CustomActorImpl
 

diff --git a/base/dali-toolkit/internal/controls/buttons/button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/button-impl.cpp
index 4f4d3b3..fc1373d 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/base/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -232,7 +232,7 @@ void Button::OnControlSizeSet(const Vector3& targetSize)
   }
 }
 
-void Button::OnTap(Actor actor, TapGesture tap)
+void Button::OnTap(Actor actor, const TapGesture& tap)
 {
   // Do nothing.
 }

diff --git a/base/dali-toolkit/internal/controls/buttons/button-impl.h b/base/dali-toolkit/internal/controls/buttons/button-impl.h
index 4ad9bd0..166f315 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/button-impl.h
+++ b/base/dali-toolkit/internal/controls/buttons/button-impl.h
@@ -211,7 +211,7 @@ private:
    * @param[in]  actor  The tapped actor.
    * @param[in]  tap    The tap gesture.
    */
-  void OnTap(Actor actor, TapGesture tap);
+  void OnTap(Actor actor, const TapGesture& tap);
 
 private:
 

diff --git a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
index 633a1d2..231f85c 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
+++ b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
@@ -1114,7 +1114,7 @@ float ItemView::ClampFirstItemPosition(float targetPosition, const Vector3& targ
   return clamppedPosition;
 }
 
-void ItemView::OnPan(PanGesture gesture)
+void ItemView::OnPan( const PanGesture& gesture )
 {
   Actor self = Self();
   const Vector3 layoutSize = Self().GetCurrentSize();

diff --git a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
index e10c1b7..dba4629 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
+++ b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
@@ -444,7 +444,7 @@ private:
    *
    * @param[in] gesture The gesture event.
    */
-  void OnPan(PanGesture pan);
+  void OnPan( const PanGesture& pan );
 
   /**
    * Helper to handle anchoring animations.

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
index 1f1f118..792f33a 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
@@ -2435,7 +2435,7 @@ void ScrollView::GestureContinuing(const Vector2& panDelta)
 // TODO: Upgrade to use a more powerful gesture detector (one that supports multiple touches on pan - so works as pan and flick gesture)
 // BUG: Gesture::Finished doesn't always return velocity on release (due to
 // timeDelta between last two events being 0 sometimes, or posiiton being the same)
-void ScrollView::OnPan(PanGesture gesture)
+void ScrollView::OnPan( const PanGesture& gesture )
 {
   // Guard against destruction during signal emission
   // Note that Emit() methods are called indirectly e.g. from within ScrollView::OnGestureEx()

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
index 84723bb..d0ab90a 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
@@ -696,7 +696,7 @@ private:
    *
    * @param[in] gesture The gesture event.
    */
-  void OnPan(PanGesture pan);
+  void OnPan( const PanGesture& pan);
 
   /**
    * Extension of the above gestures.

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
index a2754b5..6ac183f 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
@@ -128,7 +128,7 @@ Vector4 Decorator::GetBoundingBox() const
 /**
  * Selection Handles
  */
-void Decorator::OnHandlePan(Actor actor, PanGesture gesture)
+void Decorator::OnHandlePan(Actor actor, const PanGesture& gesture)
 {
   Actor selectionHandleOne = mTextInputHandles.GetSelectionHandleOne();
   Actor selectionHandleTwo = mTextInputHandles.GetSelectionHandleTwo();

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h
index e1b3787..7d316da 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h
@@ -107,7 +107,7 @@ public:
    * @param actor Handle of the selection or grab handle.
    * @param gesture Data structure with the parameters of the gesture.
    */
-  void OnHandlePan(Actor actor, PanGesture gesture);
+  void OnHandlePan(Actor actor, const PanGesture& gesture);
 
   // Selection Handles
 

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
index 67eac9a..9882c1e 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
@@ -1207,7 +1207,7 @@ float TextInput::GetHeightForWidth( float width )
 
 // Private Internal methods
 
-void TextInput::OnHandlePan(Actor actor, PanGesture gesture)
+void TextInput::OnHandlePan(Actor actor, const PanGesture& gesture)
 {
   switch (gesture.state)
   {
@@ -1332,7 +1332,7 @@ bool TextInput::OnHandleTwoTouched(Dali::Actor actor, const TouchEvent& touch)
   return false;
 }
 
-void TextInput::OnDoubleTap(Dali::Actor actor, Dali::TapGesture tap)
+void TextInput::OnDoubleTap(Dali::Actor actor, const Dali::TapGesture& tap)
 {
    // If text exists then select nearest word.
    if ( !mStyledText.empty())
@@ -1397,7 +1397,7 @@ void TextInput::OnDoubleTap(Dali::Actor actor, Dali::TapGesture tap)
 }
 
 // TODO: Change the function name to be more general.
-void TextInput::OnTextTap(Dali::Actor actor, Dali::TapGesture tap)
+void TextInput::OnTextTap(Dali::Actor actor, const Dali::TapGesture& tap)
 {
   DALI_LOG_INFO( gLogFilter, Debug::General, "OnTap mPreEditFlag[%s] mEditOnTouch[%s] mEditModeActive[%s] ", (mPreEditFlag)?"true":"false"
                                                                                                            , (mEditOnTouch)?"true":"false"
@@ -1519,7 +1519,7 @@ void TextInput::OnTextTap(Dali::Actor actor, Dali::TapGesture tap)
   }
 }
 
-void TextInput::OnLongPress(Dali::Actor actor, Dali::LongPressGesture longPress)
+void TextInput::OnLongPress(Dali::Actor actor, const Dali::LongPressGesture& longPress)
 {
   DALI_LOG_INFO( gLogFilter, Debug::General, "OnLongPress\n" );
 

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-impl.h
index cc46e41..76160de 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-impl.h
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-impl.h
@@ -621,7 +621,7 @@ private:
     * @param actor Handle of the selection or grab handle.
     * @param gesture Data structure with the parameters of the gesture.
     */
-   void OnHandlePan(Actor actor, PanGesture gesture);
+   void OnHandlePan(Actor actor, const PanGesture& gesture);
 
    /**
     * Callback for touch down on Grab handle
@@ -649,21 +649,21 @@ private:
     * @param[in] actor
     * @param[in] tap touch event
     */
-   void OnTextTap(Dali::Actor actor, Dali::TapGesture tap);
+   void OnTextTap(Dali::Actor actor, const Dali::TapGesture& tap);
 
    /**
     * Callback for double tap on TextInput
     * @param[in] actor
     * @param[in] tap touch event
     */
-   void OnDoubleTap(Dali::Actor actor, Dali::TapGesture tap);
+   void OnDoubleTap(Dali::Actor actor, const Dali::TapGesture& tap);
 
     /**
      * Callback for long press on TextInput
      * @param[in] actor
      * @param[in] longPress long press event
      */
-   void OnLongPress(Dali::Actor actor, Dali::LongPressGesture longPress);
+   void OnLongPress(Dali::Actor actor, const Dali::LongPressGesture& longPress);
 
    /**
     * Callback for the ClipboardEventNotifier when text is selected in the clipboard window.

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
index c3e5018..e69956e 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
@@ -1675,7 +1675,7 @@ void TextView::DestroyOffscreenRenderingResources()
   }
 }
 
-void TextView::OnTextPan( Actor actor, PanGesture gesture )
+void TextView::OnTextPan( Actor actor, const PanGesture& gesture )
 {
   if( 1u == gesture.numberOfTouches )
   {

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-impl.h b/base/dali-toolkit/internal/controls/text-view/text-view-impl.h
index e1cbc42..8c02e38 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-impl.h
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-impl.h
@@ -497,7 +497,7 @@ private:
    * @param[in] actor Handle of the text-view.
    * @param[in] gesture Data structure with the parameters of the gesture.
    */
-  void OnTextPan( Actor actor, PanGesture gesture );
+  void OnTextPan( Actor actor, const PanGesture& gesture );
 
   /**
    * Ensures the text-view's boundaries are fully covered of text.

diff --git a/base/dali-toolkit/public-api/controls/control-impl.cpp b/base/dali-toolkit/public-api/controls/control-impl.cpp
index 87e7a0d..089034d 100644 (file)
--- a/base/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/base/dali-toolkit/public-api/controls/control-impl.cpp
@@ -271,22 +271,22 @@ public:
 
   // Gesture Detection Methods
 
-  void PinchDetected(Actor actor, PinchGesture pinch)
+  void PinchDetected(Actor actor, const PinchGesture& pinch)
   {
     mControlImpl.OnPinch(pinch);
   }
 
-  void PanDetected(Actor actor, PanGesture pan)
+  void PanDetected(Actor actor, const PanGesture& pan)
   {
     mControlImpl.OnPan(pan);
   }
 
-  void TapDetected(Actor actor, TapGesture tap)
+  void TapDetected(Actor actor, const TapGesture& tap)
   {
     mControlImpl.OnTap(tap);
   }
 
-  void LongPressDetected(Actor actor, LongPressGesture longPress)
+  void LongPressDetected(Actor actor, const LongPressGesture& longPress)
   {
     mControlImpl.OnLongPress(longPress);
   }
@@ -787,7 +787,7 @@ void Control::OnThemeChange( Toolkit::StyleManager styleManager )
   GetImpl( styleManager ).ApplyThemeStyle( GetOwner() );
 }
 
-void Control::OnPinch(PinchGesture pinch)
+void Control::OnPinch(const PinchGesture& pinch)
 {
   if( !( mImpl->mStartingPinchScale ) )
   {
@@ -803,6 +803,18 @@ void Control::OnPinch(PinchGesture pinch)
   Self().SetScale( *( mImpl->mStartingPinchScale ) * pinch.scale );
 }
 
+void Control::OnPan( const PanGesture& pan )
+{
+}
+
+void Control::OnTap(const TapGesture& tap)
+{
+}
+
+void Control::OnLongPress( const LongPressGesture& longPress )
+{
+}
+
 void Control::OnStageConnection()
 {
   RelayoutRequest();

diff --git a/base/dali-toolkit/public-api/controls/control-impl.h b/base/dali-toolkit/public-api/controls/control-impl.h
index f79bb8b..9533b21 100644 (file)
--- a/base/dali-toolkit/public-api/controls/control-impl.h
+++ b/base/dali-toolkit/public-api/controls/control-impl.h
@@ -343,7 +343,7 @@ private: // For derived classes to override
    * @param[in]  pinch  The pinch gesture.
    * @see EnableGestureDetection
    */
-  virtual void OnPinch(PinchGesture pinch);
+  virtual void OnPinch(const PinchGesture& pinch);
 
   /**
    * @brief Called whenever a pan gesture is detected on this control.
@@ -356,7 +356,7 @@ private: // For derived classes to override
    * @param[in]  pan  The pan gesture.
    * @see EnableGestureDetection
    */
-  virtual void OnPan(PanGesture pan) { }
+  virtual void OnPan( const PanGesture& pan );
 
   /**
    * @brief Called whenever a tap gesture is detected on this control.
@@ -369,7 +369,7 @@ private: // For derived classes to override
    * @param[in]  tap  The tap gesture.
    * @see EnableGestureDetection
    */
-  virtual void OnTap(TapGesture tap) { }
+  virtual void OnTap( const TapGesture& tap );
 
   /**
    * @brief Called whenever a long press gesture is detected on this control.
@@ -382,7 +382,7 @@ private: // For derived classes to override
    * @param[in]  longPress  The long press gesture.
    * @see EnableGestureDetection
    */
-  virtual void OnLongPress(LongPressGesture longPress) { }
+  virtual void OnLongPress( const LongPressGesture& longPress );
 
   /**
    * @brief Called whenever the control is added to the stage.

diff --git a/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp b/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp
index 0ebdb0c..ed9d27b 100644 (file)
--- a/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp
@@ -355,7 +355,7 @@ void MaskedImageView::OnPropertySet( Property::Index index, Property::Value prop
   }
 }
 
-void MaskedImageView::OnPan(Actor source, PanGesture gesture)
+void MaskedImageView::OnPan(Actor source, const PanGesture& gesture)
 {
   // Used to flag whether edit mode is setting properties
   mSelfPropertySetting = true;
@@ -380,7 +380,7 @@ void MaskedImageView::OnPan(Actor source, PanGesture gesture)
   mSelfPropertySetting = false;
 }
 
-void MaskedImageView::OnPinch(Actor actor, PinchGesture pinch)
+void MaskedImageView::OnPinch(Actor actor, const PinchGesture& pinch)
 {
   // Used to flag whether edit mode is setting properties
   mSelfPropertySetting = true;

diff --git a/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h b/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h
index 00c0853..f9af407 100644 (file)
--- a/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h
@@ -149,12 +149,12 @@ protected:
   /**
    * Helper for edit mode.
    */
-  void OnPan( Actor source, PanGesture gesture );
+  void OnPan( Actor source, const PanGesture& gesture );
 
   /**
    * Helper for edit mode.
    */
-  void OnPinch( Actor actor, PinchGesture pinch );
+  void OnPinch( Actor actor, const PinchGesture& pinch );
 
   /**
    * Construct a new MaskedImageView.

diff --git a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
index 4f548bf..c844d88 100644 (file)
--- a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
@@ -666,7 +666,7 @@ void PageTurnView::RefreshCurrentPage()
   RenderPage( mCurrentPageIndex );
 }
 
-void PageTurnView::OnPan( PanGesture gesture )
+void PageTurnView::OnPan( const PanGesture& gesture )
 {
   if( mIsEditMode )
   {

diff --git a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
index 27f9778..d36ab2f 100644 (file)
--- a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
@@ -191,7 +191,7 @@ private: // from Control
   /**
    * @copydoc Toolkit::Control::OnPan
    */
-  virtual void OnPan( PanGesture gesture );
+  virtual void OnPan( const PanGesture& gesture );
 
   /**
    * @copydoc Toolkit::Control::OnInitialize

diff --git a/optional/dali-toolkit/internal/controls/slider/slider-impl.cpp b/optional/dali-toolkit/internal/controls/slider/slider-impl.cpp
index 7f82bc3..baef732 100755 (executable)
--- a/optional/dali-toolkit/internal/controls/slider/slider-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/slider/slider-impl.cpp
@@ -273,7 +273,7 @@ bool Slider::OnTouchEvent(Actor actor, const TouchEvent& event)
   return true;
 }
 
-void Slider::OnPan( Actor actor, PanGesture gesture )
+void Slider::OnPan( Actor actor, const PanGesture& gesture )
 {
   // gesture.position is in local actor coordinates
   if( mState != DISABLED )

diff --git a/optional/dali-toolkit/internal/controls/slider/slider-impl.h b/optional/dali-toolkit/internal/controls/slider/slider-impl.h
index 20ac87a..d4ac718 100755 (executable)
--- a/optional/dali-toolkit/internal/controls/slider/slider-impl.h
+++ b/optional/dali-toolkit/internal/controls/slider/slider-impl.h
@@ -350,7 +350,7 @@ private:
    * @param[in] actor The actor the event is raised for
    * @param[in] gesture The pan event info
    */
-  void OnPan( Actor actor, PanGesture gestur );
+  void OnPan( Actor actor, const PanGesture& gesture );
 
   /**
    * Map a position onto a domain and return the result as a percentage