4525527852
No user visible changes expected, these are just the internal API preparations. Modifies the Drop API for views so that tree-views can choose to insert items before, after and into other items. Note: While there is support for drag-tooltips that can explain how an item will be inserted, there is no drawing yet like in the Outliner, that indicates if an item is inserted before, after or into. There is some work on that but that can be done separately. Changes: - Removes `AbstractViewDropTarget` that was shared between tree- and grid-views, and adds `AbstractTreeViewDropTarget` and `AbstractGridViewDropTarget`. The tree-view needs specialized handling now, and although they could share some code still, it's not worth having another level of inheritance. - Modifies the drop-target API to use `DragInfo` which contains more info about the dragging operation than just the `wmDrag`. - Adds `determine_drop_location()` to the `DropTargetInterface` which drop targets can use to determine when dropping means inserting before, after or into. - Store the block and region in the view. This is needed unfortunately but shouldn't be an issue since the tree view is recreated on redraws, together with the block. - Various smaller tweaks and additions to views as needed. TODO (outside scope of this change): Increase row height so there is no gap between tree view items, but keep things visually the same otherwise. This reduces flickering while dragging. Pull Request: https://projects.blender.org/blender/blender/pulls/109825
71 lines
2.1 KiB
C++
71 lines
2.1 KiB
C++
/* SPDX-FileCopyrightText: 2023 Blender Foundation
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup edinterface
|
|
*/
|
|
|
|
#include "UI_interface.hh"
|
|
|
|
namespace blender::ui {
|
|
|
|
DragInfo::DragInfo(const wmDrag &drag, const wmEvent &event, const DropLocation drop_location)
|
|
: drag_data(drag), event(event), drop_location(drop_location)
|
|
{
|
|
}
|
|
|
|
std::optional<DropLocation> DropTargetInterface::choose_drop_location(
|
|
const ARegion & /*region*/, const wmEvent & /*event*/) const
|
|
{
|
|
return DropLocation::Into;
|
|
}
|
|
|
|
bool drop_target_apply_drop(bContext &C,
|
|
const ARegion ®ion,
|
|
const wmEvent &event,
|
|
const DropTargetInterface &drop_target,
|
|
const ListBase &drags)
|
|
{
|
|
const char *disabled_hint_dummy = nullptr;
|
|
LISTBASE_FOREACH (const wmDrag *, drag, &drags) {
|
|
if (!drop_target.can_drop(*drag, &disabled_hint_dummy)) {
|
|
return false;
|
|
}
|
|
|
|
const std::optional<DropLocation> drop_location = drop_target.choose_drop_location(region,
|
|
event);
|
|
if (!drop_location) {
|
|
return false;
|
|
}
|
|
|
|
const DragInfo drag_info{*drag, event, *drop_location};
|
|
return drop_target.on_drop(&C, drag_info);
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
char *drop_target_tooltip(const ARegion ®ion,
|
|
const DropTargetInterface &drop_target,
|
|
const wmDrag &drag,
|
|
const wmEvent &event)
|
|
{
|
|
const char *disabled_hint_dummy = nullptr;
|
|
if (!drop_target.can_drop(drag, &disabled_hint_dummy)) {
|
|
return nullptr;
|
|
}
|
|
|
|
const std::optional<DropLocation> drop_location = drop_target.choose_drop_location(region,
|
|
event);
|
|
if (!drop_location) {
|
|
return nullptr;
|
|
}
|
|
|
|
const DragInfo drag_info{drag, event, *drop_location};
|
|
const std::string tooltip = drop_target.drop_tooltip(drag_info);
|
|
return tooltip.empty() ? nullptr : BLI_strdup(tooltip.c_str());
|
|
}
|
|
|
|
} // namespace blender::ui
|