|
|
@@ -227,6 +227,11 @@ void UISelectList::HandleUIUpdate(StringHash eventType, VariantMap& eventData)
|
|
|
select->GetScrollContainer()->ScrollBy(0, speed);
|
|
|
|
|
|
}
|
|
|
+ handlingDragAndDrop_ = true;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ handlingDragAndDrop_ = false;
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -239,10 +244,8 @@ bool UISelectList::OnEvent(const tb::TBWidgetEvent &ev)
|
|
|
}
|
|
|
if (ev.type == EVENT_TYPE_POINTER_MOVE)
|
|
|
{
|
|
|
- UIDragDrop* dragDrop = GetSubsystem<UIDragDrop>();
|
|
|
-
|
|
|
//if we handle drag and drop then return true, to avoid panning scroll widget by turbobadger, let the widget control scroll by itself
|
|
|
- if (dragDrop->GetDraggingObject())
|
|
|
+ if (handlingDragAndDrop_)
|
|
|
return true;
|
|
|
}
|
|
|
return UIWidget::OnEvent(ev);
|
|
|
@@ -273,4 +276,5 @@ void UISelectList::SetUIListView(bool value)
|
|
|
|
|
|
}
|
|
|
|
|
|
+
|
|
|
}
|