diff options
| author | Nathan Craddock <nzcraddock@gmail.com> | 2020-08-20 20:29:42 +0300 |
|---|---|---|
| committer | Nathan Craddock <nzcraddock@gmail.com> | 2020-08-20 20:29:42 +0300 |
| commit | 65afd36ed7a1bb42d4e1a4ad3bac5acfa45590a2 (patch) | |
| tree | 5611d526ebb802f9f685507828c9f2681f19d12e /source/blender/editors/space_outliner/outliner_draw.c | |
| parent | 538bb8002c524bf9ca88c0407ce3e485149b1844 (diff) | |
| parent | 1d78720e741b6ab18bbec1fefcc1bd28d42c02da (diff) | |
Merge branch 'outliner-parent-highlight' into soc-2020-outliner
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_draw.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 11e5f1bc3d5..2f3bb019c20 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -3473,6 +3473,7 @@ static void outliner_draw_highlights_recursive(const ARegion *region, LISTBASE_FOREACH (TreeElement *, te, lb) { const TreeStoreElem *tselem = TREESTORE(te); const int start_y = *io_start_y; + const int end_x = (int)region->v2d.cur.xmax; /* selection status */ if ((tselem->flag & TSE_ACTIVE) && (tselem->flag & TSE_SELECTED)) { @@ -3485,7 +3486,6 @@ static void outliner_draw_highlights_recursive(const ARegion *region, /* highlights */ if (tselem->flag & (TSE_DRAG_ANY | TSE_HIGHLIGHTED | TSE_SEARCHMATCH)) { - const int end_x = (int)region->v2d.cur.xmax; if (tselem->flag & TSE_DRAG_ANY) { /* drag and drop highlight */ @@ -3533,6 +3533,11 @@ static void outliner_draw_highlights_recursive(const ARegion *region, start_x + UI_UNIT_X, io_start_y); } + else if (outliner_find_element_with_flag(&te->subtree, TSE_ACTIVE)) { + /* Parent highlight for active element in collapsed subtree. */ + immUniformColor4fv(col_highlight); + immRecti(pos, 0, start_y, end_x, start_y + UI_UNIT_Y); + } } } |