blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Property Search: Properly set expansion for instanced panels 

Stack panels (for modifiers, etc..) also get their expansion from their
associated list data. This means that property search expansion needs
to properly update the list data, which can be accomplished by calling
`set_panels_list_data_expand_flag`.

This commit also moves this logic to `UI_panels_end`, where it fits
better.
This commit is contained in:
Hans Goudey 2020-09-15 15:57:30 -05:00
parent a4c5811e21
commit cf0791bf38
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/interface/interface_panel.c
View File

@ -845,6 +845,9 @@ bool UI_panel_matches_search_filter(const Panel *panel)
return search_filter_matches;
}
/**
* Expands a panel if it was tagged as having a result by property search, otherwise collapses it.
*/
static void panel_set_expansion_from_seach_filter_recursive(const bContext *C, Panel *panel)
{
short start_flag = panel->flag;
@ -1913,6 +1916,15 @@ void UI_panels_end(const bContext *C, ARegion *region, int *r_x, int *r_y)
region_panels_set_expansion_from_list_data(C, region);
/* Update panel expansion based on property search results. */
if (region->flag & RGN_FLAG_SEARCH_FILTER_UPDATE) {
/* Don't use the last update from the deactivation, or all the panels will be left closed. */
if (region->flag & RGN_FLAG_SEARCH_FILTER_ACTIVE) {
UI_panels_set_expansion_from_seach_filter(C, region);
set_panels_list_data_expand_flag(C, region);
}
}
/* offset contents */
LISTBASE_FOREACH (uiBlock *, block, &region->uiblocks) {
if (block->active && block->panel) {

8
source/blender/editors/screen/area.c
View File

@ -2945,14 +2945,6 @@ void ED_region_panels_layout_ex(const bContext *C,
}
}
/* Update panel expansion based on property search results. */
if (region->flag & RGN_FLAG_SEARCH_FILTER_UPDATE) {
/* Don't use the last update from the deactivation, or all the panels will be left closed. */
if (region->flag & RGN_FLAG_SEARCH_FILTER_ACTIVE) {
UI_panels_set_expansion_from_seach_filter(C, region);
}
}
/* align panels and return size */
UI_panels_end(C, region, &x, &y);