diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-06-15 14:46:32 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-06-15 14:46:32 +0300 |
| commit | 3c64696972572cffdc02441a2039c914923796e8 (patch) | |
| tree | 02979c9cde24fe657833147f2672c5d92ce04e2e | |
| parent | e0db647d35cd10675f8ab529f0f5f8e26680973b (diff) | |
Fix T48654: outline text visible while renaming
Both button and rename text would draw while renaming,
caused issues with some themes.
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index b624c7cba75..554009da8be 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1579,11 +1579,19 @@ static void outliner_draw_tree_element( glDisable(GL_BLEND); /* name */ - if (active == OL_DRAWSEL_NORMAL) UI_ThemeColor(TH_TEXT_HI); - else if (ELEM(tselem->type, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM)) UI_ThemeColorBlend(TH_BACK, TH_TEXT, 0.75f); - else UI_ThemeColor(TH_TEXT); - - UI_fontstyle_draw_simple(fstyle, startx + offsx, *starty + 5 * ufac, te->name); + if ((tselem->flag & TSE_TEXTBUT) == 0) { + if (active == OL_DRAWSEL_NORMAL) { + UI_ThemeColor(TH_TEXT_HI); + } + else if (ELEM(tselem->type, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM)) { + UI_ThemeColorBlend(TH_BACK, TH_TEXT, 0.75f); + } + else { + UI_ThemeColor(TH_TEXT); + } + + UI_fontstyle_draw_simple(fstyle, startx + offsx, *starty + 5 * ufac, te->name); + } offsx += (int)(UI_UNIT_X + UI_fontstyle_string_width(fstyle, te->name)); |