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