Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2012-01-22 10:10:21 +0400
committerJoshua Leung <aligorith@gmail.com>2012-01-22 10:10:21 +0400
commitd8d2dc552a47d521b1d8c93ce13d5216b31c72f0 (patch)
tree6663fbbb16eeae2ce2913fe18fc00a61989de0e7 /source/blender/editors/space_outliner
parent57d48d4493a78d2886f83a28fe66c2654bed4f6c (diff)
Patch [#28608] Add search match colour to theme settings
Submitted by Shane Ambler (sambler) From patch description: As a follow on from #23443 - committed in r40066 I have added the outliner filter match highlight colour to the theme settings. Default colour is a light green matching what was originally hard coded.
Diffstat (limited to 'source/blender/editors/space_outliner')
-rw-r--r--source/blender/editors/space_outliner/outliner_draw.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index f8abfb6f4c3..0264cf5ad05 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1258,8 +1258,10 @@ static void outliner_draw_tree_element(bContext *C, uiBlock *block, Scene *scene
if ( (SEARCHING_OUTLINER(soops) || (soops->outlinevis==SO_DATABLOCKS && soops->search_string[0]!=0)) &&
(tselem->flag & TSE_SEARCHMATCH))
{
- /* TODO - add search highlight color to theme? */
- glColor4f(0.2f, 0.5f, 0.2f, 0.3f);
+ char col[4];
+ UI_GetThemeColorType4ubv(TH_MATCH, SPACE_OUTLINER, col);
+ col[3]=100;
+ glColor4ubv((GLubyte *)col);
glRecti(startx, *starty+1, ar->v2d.cur.xmax, *starty+UI_UNIT_Y-1);
}
@@ -1513,8 +1515,8 @@ static void outliner_draw_tree(bContext *C, uiBlock *block, Scene *scene, ARegio
}
/* always draw selection fill before hierarchy */
- UI_GetThemeColor3fv(TH_BACK, col);
- glColor3f(col[0]+0.06f, col[1]+0.08f, col[2]+0.10f);
+ UI_GetThemeColor3fv(TH_SELECT_HIGHLIGHT, col);
+ glColor3fv(col);
starty= (int)ar->v2d.tot.ymax-UI_UNIT_Y-OL_Y_OFFSET;
outliner_draw_selection(ar, soops, &soops->tree, &starty);