1 files changed, 13 insertions, 19 deletions

diff --git a/source/blender/editors/interface/interface_dropboxes.cc b/source/blender/editors/interface/interface_dropboxes.cc
index 9d3c1372b15..b72d8d2c238 100644
--- a/source/blender/editors/interface/interface_dropboxes.cc
+++ b/source/blender/editors/interface/interface_dropboxes.cc
@@ -22,15 +22,14 @@
 #include "UI_interface.h"
 
 /* -------------------------------------------------------------------- */
-/** \name Tree View Drag/Drop Callbacks
+/** \name View Drag/Drop Callbacks
  * \{ */
 
-static bool ui_tree_view_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event)
+static bool ui_view_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event)
 {
   const ARegion *region = CTX_wm_region(C);
-  const uiTreeViewItemHandle *hovered_tree_item = UI_block_tree_view_find_item_at(region,
-                                                                                  event->xy);
-  if (!hovered_tree_item) {
+  const uiViewItemHandle *hovered_item = UI_region_views_find_item_at(region, event->xy);
+  if (!hovered_item) {
     return false;
   }
 
@@ -39,21 +38,21 @@ static bool ui_tree_view_drop_poll(bContext *C, wmDrag *drag, const wmEvent *eve
   }
 
   drag->drop_state.free_disabled_info = false;
-  return UI_tree_view_item_can_drop(hovered_tree_item, drag, &drag->drop_state.disabled_info);
+  return UI_view_item_can_drop(hovered_item, drag, &drag->drop_state.disabled_info);
 }
 
-static char *ui_tree_view_drop_tooltip(bContext *C,
-                                       wmDrag *drag,
-                                       const int xy[2],
-                                       wmDropBox *UNUSED(drop))
+static char *ui_view_drop_tooltip(bContext *C,
+                                  wmDrag *drag,
+                                  const int xy[2],
+                                  wmDropBox *UNUSED(drop))
 {
   const ARegion *region = CTX_wm_region(C);
-  const uiTreeViewItemHandle *hovered_tree_item = UI_block_tree_view_find_item_at(region, xy);
-  if (!hovered_tree_item) {
+  const uiViewItemHandle *hovered_item = UI_region_views_find_item_at(region, xy);
+  if (!hovered_item) {
     return nullptr;
   }
 
-  return UI_tree_view_item_drop_tooltip(hovered_tree_item, drag);
+  return UI_view_item_drop_tooltip(hovered_item, drag);
 }
 
 /** \} */
@@ -140,12 +139,7 @@ void ED_dropboxes_ui()
 {
   ListBase *lb = WM_dropboxmap_find("User Interface", SPACE_EMPTY, 0);
 
-  WM_dropbox_add(lb,
-                 "UI_OT_tree_view_drop",
-                 ui_tree_view_drop_poll,
-                 nullptr,
-                 nullptr,
-                 ui_tree_view_drop_tooltip);
+  WM_dropbox_add(lb, "UI_OT_view_drop", ui_view_drop_poll, nullptr, nullptr, ui_view_drop_tooltip);
   WM_dropbox_add(lb,
                  "UI_OT_drop_name",
                  ui_drop_name_poll,