Revert "I've done small clean up for the ui pointer event(again), it's related a bit to the #512, because the click/up event was sent twice"

This reverts commit 5d4cb694642ca6368ec26a5f575604cea8404e07.

Source/Atomic/UI/UIListView.cpp

@@ -252,6 +252,7 @@ ListViewItemWidget::ListViewItemWidget(ListViewItem *item, ListViewItemSource *s
     SetLayoutDistribution(LAYOUT_DISTRIBUTION_GRAVITY);
     SetLayoutDistributionPosition(LAYOUT_DISTRIBUTION_POSITION_LEFT_TOP);
     SetPaintOverflowFadeout(false);
+    SetCapturing(false);
 
     item_->widget_ = this;
 

Source/Atomic/UI/UISelectList.cpp

@@ -227,11 +227,7 @@ void UISelectList::HandleUIUpdate(StringHash eventType, VariantMap& eventData)
                 select->GetScrollContainer()->ScrollBy(0, speed);
 
         }
-        handlingDragAndDrop_ = true;
-    }
-    else
-    {
-        handlingDragAndDrop_ = false;
+
     }
 
 }
@@ -242,12 +238,6 @@ bool UISelectList::OnEvent(const tb::TBWidgetEvent &ev)
     {
         GetTBSelectList()->SetFocus(WIDGET_FOCUS_REASON_POINTER);
     }
-    if (ev.type == EVENT_TYPE_POINTER_MOVE)
-    {
-        //if we handle drag and drop then return true, to avoid panning scroll widget by turbobadger, let the widget control scroll by itself
-        if (handlingDragAndDrop_)
-            return true;
-    }
     return UIWidget::OnEvent(ev);
 }
 

Source/Atomic/UI/UISelectList.h

@@ -77,8 +77,7 @@ protected:
     virtual bool OnEvent(const tb::TBWidgetEvent &ev);
 
 private:
-    //Returns true if we have drag and drop element on select list widget
-    bool handlingDragAndDrop_;
+
 };
 
 

Source/AtomicEditor/Editors/ResourceEditor.cpp

@@ -61,6 +61,10 @@ public:
 
     bool OnEvent(const TBWidgetEvent &ev)
     {
+        // Don't process pointer down, we only respond to click events
+        if (ev.type == EVENT_TYPE_POINTER_DOWN)
+            return true;
+
         if (ev.type == EVENT_TYPE_CLICK)
         {
             if (ev.target->GetID() == TBIDC("unsaved_modifications_dialog"))

Source/ThirdParty/TurboBadger/tb_widgets.cpp

@@ -1353,35 +1353,31 @@ void TBWidget::InvokePointerDown(int x, int y, int click_count, MODIFIER_KEYS mo
 
 void TBWidget::InvokePointerUp(int x, int y, MODIFIER_KEYS modifierkeys, bool touch, int touchId)
 {
-    //First check for the captured widget
-    if (captured_widget && captured_widget->touchId_ == touchId)
-    {
-        captured_widget->ConvertFromRoot(x, y);
-        TBWidgetEvent ev_up(EVENT_TYPE_POINTER_UP, x, y, touch, modifierkeys);
-        TBWidgetEvent ev_click(EVENT_TYPE_CLICK, x, y, touch, modifierkeys);
-        captured_widget->InvokeEvent(ev_up);
-        if (!cancel_click && captured_widget->GetHitStatus(x, y))
-        {
-            captured_widget->InvokeEvent(ev_click);
-        }
-        captured_widget->ReleaseCapture();
-    }
     TBWidget* down_widget = GetWidgetAt(x, y, true);
-	//then if we have any down widgets, then make sure that it's not captured_widget otherwise events will be sent twice
-    if (down_widget && down_widget->touchId_ == touchId && captured_widget != down_widget)
+	if ((down_widget && down_widget->touchId_ == touchId) || captured_widget)
 	{
-		down_widget->ConvertFromRoot(x, y);
         TBWidgetEvent ev_up(EVENT_TYPE_POINTER_UP, x, y, touch, modifierkeys);
         TBWidgetEvent ev_click(EVENT_TYPE_CLICK, x, y, touch, modifierkeys);
-    	down_widget->InvokeEvent(ev_up);
+        down_widget->Invalidate();
+        down_widget->InvalidateSkinStates();
+        down_widget->OnCaptureChanged(false);
+		down_widget->ConvertFromRoot(x, y);
+		down_widget->InvokeEvent(ev_up);
         if (!cancel_click && down_widget->GetHitStatus(x, y))
         {
 			down_widget->InvokeEvent(ev_click);
         }
-        down_widget->Invalidate();
-        down_widget->InvalidateSkinStates();
-        down_widget->OnCaptureChanged(false);
-    }
+        if (captured_widget)
+        {
+            captured_widget->ConvertFromRoot(x, y);
+            if (!cancel_click && captured_widget->GetHitStatus(x, y))
+            {
+                captured_widget->InvokeEvent(ev_click);
+            }
+            captured_widget->InvokeEvent(ev_up);
+            captured_widget->ReleaseCapture();
+        }
+	}
 }
 
 void TBWidget::InvokeRightPointerDown(int x, int y, int click_count, MODIFIER_KEYS modifierkeys)
@@ -1411,6 +1407,7 @@ void TBWidget::InvokeRightPointerUp(int x, int y, MODIFIER_KEYS modifierkeys)
 
 }
 
+
 void TBWidget::MaybeInvokeLongClickOrContextMenu(bool touch)
 {
 	StopLongClickTimer();