blender
/
blender
130
398
Fork 574
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Outliner tooltips: Small refactor, future proof change 

In the future we may have siblings to collections (like overrides) that are not
collections. This change make sure tooltips will keep working.

Note: This was originally wrongly committed together with a Collada fix,
re-committing separately now. See bd7060a87f.
This commit is contained in:
Dalai Felinto 2018-01-26 08:42:15 -02:00
parent 13238ee991
commit de079abfbd
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/blender/editors/space_outliner/outliner_ops.c
View File

@ -250,21 +250,36 @@ static int outliner_item_drag_drop_modal(bContext *C, wmOperator *op, const wmEv
return retval;
}
/**
* Check if the given TreeElement is a collection
*
* This test is mainly used to see if next/prev TreeElement is a collection.
* It will fail when there is no next/prev TreeElement, or when the
* element is an Override or something else in the future.
*/
static bool tree_element_is_collection_get(const TreeElement *te) {
if (te == NULL) {
return false;
}
TreeStoreElem *tselem = TREESTORE(te);
return ELEM(tselem->type, TSE_LAYER_COLLECTION, TSE_SCENE_COLLECTION);
}
static const char *outliner_drag_drop_tooltip_get(
const TreeElement *te_float)
{
const char *name = NULL;
TreeStoreElem *tselem = TREESTORE(te_float);
const TreeElement *te_insert = te_float->drag_data->insert_handle;
if (ELEM(tselem->type, TSE_LAYER_COLLECTION, TSE_SCENE_COLLECTION)) {
if (tree_element_is_collection_get(te_float)) {
if (te_insert == NULL) {
name = TIP_("Move collection");
}
else {
switch (te_float->drag_data->insert_type) {
case TE_INSERT_BEFORE:
if (te_insert->prev) {
if (tree_element_is_collection_get(te_insert->prev)) {
name = TIP_("Move between collections");
}
else {
@ -272,7 +287,7 @@ static const char *outliner_drag_drop_tooltip_get(
}
break;
case TE_INSERT_AFTER:
if (te_insert->next) {
if (tree_element_is_collection_get(te_insert->next)) {
name = TIP_("Move between collections");
}
else {
@ -285,7 +300,7 @@ static const char *outliner_drag_drop_tooltip_get(
}
}
}
else if ((tselem->type == 0) && (te_float->idcode == ID_OB)) {
else if ((TREESTORE(te_float)->type == 0) && (te_float->idcode == ID_OB)) {
name = TIP_("Move to collection (Ctrl to add)");
}