blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

Property Search: Don't use search color for subpanel titles 

This replaces the blue theme color for subpanel titles with the the same
fade as for parent panels.

The search color doesn't work well for subpanel title colors. And actually,
because there are often buttons with checkboxes in the panel headers, we
don't have to treat this indicator any differently than regular buttons.

Differential Revision: https://developer.blender.org/D8976
This commit is contained in:
Hans Goudey 2020-10-02 13:14:33 -05:00
parent 933bf62a61
commit a03bd6460c
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +132,6 @@ static bool panel_type_context_poll(ARegion *region,
static void panel_title_color_get(const Panel *panel,
const bool show_background,
const bool use_search_color,
const bool region_search_filter_active,
uchar r_color[4])
{
@ -146,16 +145,11 @@ static void panel_title_color_get(const Panel *panel,
const bool search_match = UI_panel_matches_search_filter(panel);
if (region_search_filter_active && use_search_color && search_match) {
UI_GetThemeColor4ubv(TH_MATCH, r_color);
}
else {
UI_GetThemeColor4ubv(TH_TITLE, r_color);
if (region_search_filter_active && !search_match) {
r_color[0] *= 0.5;
r_color[1] *= 0.5;
r_color[2] *= 0.5;
}
UI_GetThemeColor4ubv(TH_TITLE, r_color);
if (region_search_filter_active && !search_match) {
r_color[0] *= 0.5;
r_color[1] *= 0.5;
r_color[2] *= 0.5;
}
}
@ -965,8 +959,7 @@ static void ui_draw_aligned_panel_header(const uiStyle *style,
/* Draw text labels. */
uchar col_title[4];
panel_title_color_get(
panel, show_background, is_subpanel, region_search_filter_active, col_title);
panel_title_color_get(panel, show_background, region_search_filter_active, col_title);
col_title[3] = 255;
rcti hrect = *rect;
@ -1084,7 +1077,7 @@ void ui_draw_aligned_panel(const uiStyle *style,
/* draw optional pin icon */
if (show_pin && (block->panel->flag & PNL_PIN)) {
uchar col_title[4];
panel_title_color_get(panel, show_background, false, region_search_filter_active, col_title);
panel_title_color_get(panel, show_background, region_search_filter_active, col_title);
GPU_blend(GPU_BLEND_ALPHA);
UI_icon_draw_ex(headrect.xmax - ((PNL_ICON * 2.2f) / block->aspect),
@ -1199,7 +1192,7 @@ void ui_draw_aligned_panel(const uiStyle *style,
BLI_rctf_scale(&itemrect, 0.25f);
uchar col_title[4];
panel_title_color_get(panel, show_background, false, region_search_filter_active, col_title);
panel_title_color_get(panel, show_background, region_search_filter_active, col_title);
float tria_color[4];
rgb_uchar_to_float(tria_color, col_title);
tria_color[3] = 1.0f;