blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 777 Projects 19 Wiki Activity

Outliner: Double-click on item icon to select contents/hierarchy #110151

Merged
Harley Acheson merged 12 commits from mgradysaunders/blender:temp-outliner-selection into main 2024-01-17 00:45:52 +01:00
Conversation 18 Commits 12 Files Changed 4 +11 -18
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 034030b3b1 - Show all commits

29
source/blender/editors/space_outliner/outliner_select.cc
View File

@ -1610,7 +1610,7 @@ static bool do_outliner_range_select_recursive(ListBase *lb,
TreeElement *active,
TreeElement *cursor,
bool selecting,
bool recurse,
const bool recurse,
Collection *in_collection)
{
LISTBASE_FOREACH (TreeElement *, te, lb) {
@ -1661,7 +1661,8 @@ static void do_outliner_range_select(bContext *C,
SpaceOutliner *space_outliner,
TreeElement *cursor,
const bool extend,
const bool recurse)
const bool recurse,
Collection *in_collection)
{
TreeElement *active = outliner_find_element_with_flag(&space_outliner->tree, TSE_ACTIVE);
@ -1690,17 +1691,6 @@ static void do_outliner_range_select(bContext *C,
return;
}
Collection *in_collection = nullptr;
if (recurse) {
if (tselem->type == TSE_LAYER_COLLECTION) {
in_collection = static_cast<LayerCollection *>(active->directdata)->collection;
}
else if (tselem->type == TSE_SOME_ID && active->idcode == ID_OB) {
in_collection = BKE_collection_object_find(
CTX_data_main(C), CTX_data_scene(C), nullptr, reinterpret_cast<Object *>(tselem->id));
}
}
do_outliner_range_select_recursive(
&space_outliner->tree, active, cursor, false, recurse, in_collection);
}
@ -1773,8 +1763,7 @@ static int outliner_item_do_activate_from_cursor(bContext *C,
return OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH;
}
else {
/* The row may also contain children, if one is hovered we want this instead of current te.
*/
/* The row may also contain children, if one is hovered we want this instead of current te. */
bool merged_elements = false;
bool is_over_icon = false;
TreeElement *activate_te = outliner_find_item_at_x_in_row(
@ -1812,12 +1801,15 @@ static int outliner_item_do_activate_from_cursor(bContext *C,
select recursively. */
if (!recurse && (extend || use_range) &&
outliner_item_is_co_over_icon(activate_te, view_mval[0]))
{
return OPERATOR_CANCELLED;
}
if (use_range) {
do_outliner_range_select(C, space_outliner, activate_te, extend, recurse);
if (recurse)
do_outliner_range_select(C, space_outliner, activate_te, extend, recurse, in_collection);
if (recurse) {
do_outliner_select_recursive(&activate_te->subtree, /*selecting=*/true, in_collection);
}
}
Harley marked this conversation as resolved Outdated
Pratik Borhade commented 2023-08-21 14:40:40 +02:00
Outdated
Review
Copy Link

use brackets {}

use brackets {}
else {
const bool is_over_name_icons = outliner_item_is_co_over_name_icons(activate_te,
@ -1829,8 +1821,9 @@ static int outliner_item_do_activate_from_cursor(bContext *C,
/* If we're CTRL+double-clicking and the element is aleady selected, skip the activation
straight to deselection */
if (extend && recurse && activate_tselem->flag & TSE_SELECTED)
if (extend && recurse && activate_tselem->flag & TSE_SELECTED) {
select = false;
}
const short select_flag = OL_ITEM_ACTIVATE | (select ? OL_ITEM_SELECT : OL_ITEM_DESELECT) |
(is_over_name_icons ? OL_ITEM_SELECT_DATA : 0) |