griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: Shape Key: Support Drag drop multiple selected elements

Browse Source 
When drag is initiated, store selected keyblocks inside pointer array
(see: `create_drag_data`). Later iterate over these pointers inside
`on_drop()` function to place them one by one at `drop_index`

Resolves #143929

See PR description for video

Pull Request: https://projects.blender.org/blender/blender/pulls/144431
This commit is contained in:
Pratik Borhade
2025-09-29 12:53:05 +02:00
committed by Pratik Borhade
parent be6b147d16
commit f1d0f79302
1 changed files with 59 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
source/blender/editors/object/interface_template_shape_key_tree.cc
View File

@@ -69,13 +69,31 @@ class ShapeKeyDragController : public ui::AbstractViewItemDragController {
void *create_drag_data() const override
{
ShapeKey *drag_data = MEM_callocN<ShapeKey>(__func__);
*drag_data = drag_key_;
return drag_data;
}
void on_drag_start(bContext & /*C*/) override
{
drag_key_.object->shapenr = drag_key_.index + 1;
int selected_count = [&]() -> int {
int count = 0;
LISTBASE_FOREACH (KeyBlock *, kb, &drag_key_.key->block) {
count += (kb->flag & KEYBLOCK_SEL) != 0;
}
return count;
}();
KeyBlock **selected_keys_ = MEM_calloc_arrayN<KeyBlock *>(selected_count,
"Selected Key Blocks");
selected_count = 0;
int index = 0;
LISTBASE_FOREACH_INDEX (KeyBlock *, kb, &drag_key_.key->block, index) {
if (index == 0) {
/* Prevent basis shape key from dragging. */
continue;
}
if (kb->flag & KEYBLOCK_SEL) {
selected_keys_[selected_count] = kb;
selected_count++;
}
}
return selected_keys_;
}
};
@@ -98,17 +116,18 @@ class ShapeKeyDropTarget : public ui::TreeViewItemDropTarget {
if (drag.type != WM_DRAG_SHAPE_KEY) {
return false;
}
const ShapeKey *drag_shapekey = static_cast<const ShapeKey *>(drag.poin);
if (drag_shapekey->index == drop_index_) {
const KeyBlock **drag_shapekey = static_cast<const KeyBlock **>(drag.poin);
if (!drag_shapekey || !drag_shapekey[0]) {
return false;
}
return true;
}
std::string drop_tooltip(const ui::DragInfo &drag_info) const override
{
const ShapeKey *drag_shapekey = static_cast<const ShapeKey *>(drag_info.drag_data.poin);
const StringRef drag_name = drag_shapekey->kb->name;
const StringRef drag_name = TIP_("Selected Keys");
const StringRef drop_name = drop_kb_.name;
switch (drag_info.drop_location) {
@@ -132,29 +151,38 @@ class ShapeKeyDropTarget : public ui::TreeViewItemDropTarget {
bool on_drop(bContext *C, const ui::DragInfo &drag_info) const override
{
const ShapeKey *drag_shapekey = static_cast<const ShapeKey *>(drag_info.drag_data.poin);
int drop_index = drop_index_;
const int drag_index = drag_shapekey->index;
Object *ob = CTX_data_active_object(C);
Key *key = BKE_key_from_object(ob);
const KeyBlock **drag_shapekey = static_cast<const KeyBlock **>(drag_info.drag_data.poin);
switch (drag_info.drop_location) {
case ui::DropLocation::Into:
BLI_assert_unreachable();
break;
case ui::DropLocation::Before:
if (drop_index == 0) {
return false;
}
drop_index -= int(drag_index < drop_index);
break;
case ui::DropLocation::After:
drop_index += int(drag_index > drop_index);
break;
for (int8_t i = 0; drag_shapekey[i] != nullptr; i++) {
const int drag_index = BLI_findindex(&key->block, drag_shapekey[i]);
int drop_index = BLI_findindex(&key->block, &drop_kb_);
if (drag_index == -1) {
continue;
}
switch (drag_info.drop_location) {
case ui::DropLocation::Into:
BLI_assert_unreachable();
break;
case ui::DropLocation::Before:
if (drop_index == 0) {
return false;
}
drop_index -= int(drag_index < drop_index);
break;
case ui::DropLocation::After:
drop_index += int(drag_index > drop_index) + i;
break;
}
BKE_keyblock_move(ob, drag_index, drop_index);
}
Object *object = drag_shapekey->object;
BKE_keyblock_move(object, drag_shapekey->index, drop_index);
DEG_id_tag_update(static_cast<ID *>(object->data), ID_RECALC_GEOMETRY);
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, object);
DEG_id_tag_update(static_cast<ID *>(ob->data), ID_RECALC_GEOMETRY);
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
ED_undo_push(C, "Drop Active Shape Key");
return true;
@@ -257,10 +285,6 @@ class ShapeKeyItem : public ui::AbstractTreeViewItem {
std::unique_ptr<ui::AbstractViewItemDragController> create_drag_controller() const override
{
if (shape_key_.index == 0) {
/* Prevent basis shape key from dragging. */
return nullptr;
}
return std::make_unique<ShapeKeyDragController>(
static_cast<ShapeKeyTreeView &>(get_tree_view()), shape_key_);
}