[Tizen] Revert "Changes after touch consumed behaviour change"

This reverts commit e0ca203b93c8af4e14f69e2c678d890d4533f306.

Change-Id: I8ea0feb81404d7ea135d4af51f43c11d8786af37

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index 6d45eed..3cdac41 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -630,7 +630,11 @@ bool Button::OnAccessibilityActivated()
 
 bool Button::OnTouch( Actor actor, const TouchEvent& touch )
 {
-  if( !IsDisabled() && (actor == touch.GetHitActor(0)) )
+
+  // Only events are processed when the button is not disabled
+  auto result( false );
+
+  if( !IsDisabled() )
   {
     if ( 1 == touch.GetPointCount() )
     {
@@ -671,8 +675,9 @@ bool Button::OnTouch( Actor actor, const TouchEvent& touch )
       // Sets the button state to the default
       mButtonPressedState = UNPRESSED;
     }
+    result = true;
   }
-  return false;
+  return result;
 }
 
 bool Button::OnKeyboardEnter()

diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp
index b95e648..eb16bab 100644 (file)
--- a/dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp
@@ -330,14 +330,14 @@ void Popup::OnInitialize()
   mPopupLayout.SetFitHeight( 0 ); // Set row to fit.
   mPopupLayout.SetFitHeight( 1 ); // Set row to fit.
 
+  mPopupLayout.TouchedSignal().Connect( this, &Popup::OnDialogTouched );
+
   mPopupContainer.Add( mPopupLayout );
 
   // Any content after this point which is added to Self() will be re-parented to mContent.
   mAlterAddedChild = true;
 
   SetAsKeyboardFocusGroup( true );
-
-  SetupTouch();
 }
 
 Popup::~Popup()
@@ -593,6 +593,9 @@ void Popup::SetPopupBackgroundImage( Actor image )
   mPopupBackgroundImage.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
   mPopupBackgroundImage.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
 
+  // OnDialogTouched only consumes the event. It prevents the touch event to be caught by the backing.
+  mPopupBackgroundImage.TouchedSignal().Connect( this, &Popup::OnDialogTouched );
+
   // Set the popup border to be slightly larger than the layout contents.
   UpdateBackgroundPositionAndSize();
 
@@ -935,6 +938,7 @@ Toolkit::Control Popup::CreateBacking()
 
   // Default to being transparent.
   backing.SetProperty( Actor::Property::COLOR_ALPHA, 0.0f );
+  backing.TouchedSignal().Connect( this, &Popup::OnBackingTouched );
   backing.WheelEventSignal().Connect( this, &Popup::OnBackingWheelEvent );
   return backing;
 }
@@ -1115,11 +1119,7 @@ const std::string& Popup::GetTailRightImage() const
 
 void Popup::SetTouchTransparent( bool enabled )
 {
-  if( mTouchTransparent != enabled )
-  {
-    mTouchTransparent = enabled;
-    SetupTouch();
-  }
+  mTouchTransparent = enabled;
 }
 
 const bool Popup::IsTouchTransparent() const
@@ -1534,18 +1534,26 @@ bool Popup::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tra
 
 bool Popup::OnBackingTouched( Actor actor, const TouchEvent& touch )
 {
-  // Allow events to pass through if the backing isn't the hit-actor
-  if( (touch.GetHitActor(0) == actor) &&
-      (touch.GetPointCount() > 0) &&
-      (touch.GetState( 0 ) == PointState::DOWN))
+  // Allow events to pass through if touch transparency is enabled.
+  if( mTouchTransparent )
   {
-    // Guard against destruction during signal emission.
-    Toolkit::Popup handle( GetOwner() );
+    return false;
+  }
+
+  if( touch.GetPointCount() > 0 )
+  {
+    if( touch.GetState( 0 ) == PointState::DOWN )
+    {
+      // Guard against destruction during signal emission.
+      Toolkit::Popup handle( GetOwner() );
 
-    mTouchedOutsideSignal.Emit();
+      mTouchedOutsideSignal.Emit();
+    }
   }
 
-  return false;
+  // Block anything behind backing becoming touched.
+  mLayer.SetProperty( Layer::Property::CONSUMES_TOUCH, true );
+  return true;
 }
 
 bool Popup::OnBackingWheelEvent( Actor actor, const WheelEvent& event )
@@ -1556,13 +1564,22 @@ bool Popup::OnBackingWheelEvent( Actor actor, const WheelEvent& event )
     return false;
   }
 
+  // Consume wheel event in dimmed backing actor.
+  mLayer.SetProperty( Layer::Property::CONSUMES_TOUCH, true );
   return true;
 }
 
 bool Popup::OnDialogTouched( Actor actor, const TouchEvent& touch )
 {
-  // Only connecting this so the backing does not become the default hit-actor and inadvertently closes the popup
-  return false;
+  // Allow events to pass through if touch transparency is enabled.
+  if( mTouchTransparent )
+  {
+    return false;
+  }
+
+  // Consume event (stops backing actor receiving touch events)
+  mLayer.SetProperty( Layer::Property::CONSUMES_TOUCH, true );
+  return true;
 }
 
 void Popup::OnSceneConnection( int depth )
@@ -1958,26 +1975,6 @@ Actor Popup::GetNextKeyboardFocusableActor( Actor currentFocusedActor, Toolkit::
   return nextFocusableActor;
 }
 
-void Popup::SetupTouch()
-{
-  if( ! mTouchTransparent )
-  {
-    // Connect all the signals and set us up to consume all touch events
-    mBacking.TouchedSignal().Connect( this, &Popup::OnBackingTouched );
-    mPopupBackgroundImage.TouchedSignal().Connect( this, &Popup::OnDialogTouched );
-    mPopupLayout.TouchedSignal().Connect( this, &Popup::OnDialogTouched );
-    mLayer.SetProperty( Layer::Property::CONSUMES_TOUCH, true );
-  }
-  else
-  {
-    // We are touch transparent so disconnect all signals and ensure our layer does not consumed all touch events
-    mBacking.TouchedSignal().Disconnect( this, &Popup::OnBackingTouched );
-    mPopupBackgroundImage.TouchedSignal().Disconnect( this, &Popup::OnDialogTouched );
-    mPopupLayout.TouchedSignal().Disconnect( this, &Popup::OnDialogTouched );
-    mLayer.SetProperty( Layer::Property::CONSUMES_TOUCH, false );
-  }
-}
-
 } // namespace Internal
 
 } // namespace Toolkit

diff --git a/dali-toolkit/internal/controls/popup/popup-impl.h b/dali-toolkit/internal/controls/popup/popup-impl.h
old mode 100644 (file)
new mode 100755 (executable)
index a7f7120..dc99f93
--- a/dali-toolkit/internal/controls/popup/popup-impl.h
+++ b/dali-toolkit/internal/controls/popup/popup-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_POPUP_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -499,12 +499,6 @@ private:
    */
   void AddFocusableChildrenRecursive( Actor parent, std::vector< Actor >& focusableActors );
 
-  /**
-   * Sets up the touch signals connections as required.
-   * @note This must be called after all the members have been created.
-   */
-  void SetupTouch();
-
 private:
 
   // Undefined.

diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
old mode 100644 (file)
new mode 100755 (executable)
index c442fb8..6f96bef
--- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
@@ -1145,7 +1145,7 @@ bool ItemView::OnTouch( Actor actor, const TouchEvent& touch )
     RemoveAnimation(mScrollAnimation);
   }
 
-  return false; // Do not consume as we're potentially scrolling (detecting pan gestures)
+  return true; // consume since we're potentially scrolling
 }
 
 void ItemView::OnPan( const PanGesture& gesture )

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 1273cd1..7a88106
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
@@ -2129,7 +2129,7 @@ bool ScrollView::OnTouch( Actor actor, const TouchEvent& touch )
     mScrollInterrupted = false;
   }
 
-  return false;
+  return true;
 }
 
 bool ScrollView::OnWheelEvent( Actor actor, const WheelEvent& event)

diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 742311a..638f115
--- a/dali-toolkit/internal/controls/slider/slider-impl.cpp
+++ b/dali-toolkit/internal/controls/slider/slider-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -240,7 +240,7 @@ bool Slider::OnTouch(Actor actor, const TouchEvent& touch)
     }
   }
 
-  return false;
+  return true;
 }
 
 void Slider::OnPan( Actor actor, const PanGesture& gesture )

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 5fac4ba..330b756 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
@@ -1736,7 +1736,7 @@ void TextEditor::OnSceneConnection( int depth )
 
 bool TextEditor::OnTouched( Actor actor, const TouchEvent& touch )
 {
-  return false;
+  return true;
 }
 
 void TextEditor::OnIdleSignal()

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 33f1cd3..442c7a4 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
@@ -1755,7 +1755,7 @@ void TextField::OnSceneConnection( int depth )
 
 bool TextField::OnTouched( Actor actor, const TouchEvent& touch )
 {
-  return false;
+  return true;
 }
 
 void TextField::OnIdleSignal()

diff --git a/dali-toolkit/internal/drag-drop-detector/drag-and-drop-detector-impl.cpp b/dali-toolkit/internal/drag-drop-detector/drag-and-drop-detector-impl.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 994932e..d1ad520
--- a/dali-toolkit/internal/drag-drop-detector/drag-and-drop-detector-impl.cpp
+++ b/dali-toolkit/internal/drag-drop-detector/drag-and-drop-detector-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -211,7 +211,7 @@ bool DragAndDropDetector::OnDrag(Dali::Actor actor, const Dali::TouchEvent& data
     }
     mPointDown = false;
   }
-  return false;
+  return true;
 }
 
 const std::string& DragAndDropDetector::GetContent() const

diff --git a/dali-toolkit/internal/text/decorator/text-decorator.cpp b/dali-toolkit/internal/text/decorator/text-decorator.cpp
index 2a57d4d..ae4140f 100644 (file)
--- a/dali-toolkit/internal/text/decorator/text-decorator.cpp
+++ b/dali-toolkit/internal/text/decorator/text-decorator.cpp
@@ -1388,7 +1388,8 @@ struct Decorator::Impl : public ConnectionTracker
       SetHandleImage( GRAB_HANDLE );
     }
 
-    return false;
+    // Consume to avoid pop-ups accidentally closing, when handle is outside of pop-up area
+    return true;
   }
 
   bool OnHandleOneTouched( Actor actor, const TouchEvent& touch )
@@ -1418,7 +1419,8 @@ struct Decorator::Impl : public ConnectionTracker
       SetHandleImage( LEFT_SELECTION_HANDLE );
     }
 
-    return false;
+    // Consume to avoid pop-ups accidentally closing, when handle is outside of pop-up area
+    return true;
   }
 
   bool OnHandleTwoTouched( Actor actor, const TouchEvent& touch )
@@ -1448,7 +1450,8 @@ struct Decorator::Impl : public ConnectionTracker
       SetHandleImage( RIGHT_SELECTION_HANDLE );
     }
 
-    return false;
+    // Consume to avoid pop-ups accidentally closing, when handle is outside of pop-up area
+    return true;
   }
 
   void HandleResetPosition( PropertyNotification& source )

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/docs/content/example-code/properties.cpp b/docs/content/example-code/properties.cpp
index 61be376..c840964 100644 (file)
--- a/docs/content/example-code/properties.cpp
+++ b/docs/content/example-code/properties.cpp
@@ -113,7 +113,7 @@ public:
     valueText << touchedCount;
     mTagText.SetProperty( TextLabel::Property::TEXT, valueText.str() );
 
-    return true; // Consumed meaning any gestures will be cancelled
+    return true; // Consumed
   }
   // C++ EXAMPLE END