Commit: d1a7d93ace163b0f31a229251ec218e0554f4d57
Author: Nathan Craddock
Date: Mon Aug 17 21:05:55 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rBd1a7d93ace163b0f31a229251ec218e0554f4d57
Merge branch 'soc-2020-outliner' of git.blender.org:blender into
soc-2020-outliner
===================================================================
===================================================================
diff --cc source/blender/editors/space_outliner/outliner_draw.c
index 7128dee9aeb,5a101cceb2f..84f39df4d22
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@@ -2880,23 -2880,33 +2880,39 @@@ static void outliner_draw_iconrow_numbe
GPU_blend(true); /* Roundbox and text drawing disables. */
}
-static void outliner_icon_background_colors(float icon_color[4], float
icon_border[4])
+static void outliner_draw_active_highlight(const float minx,
+ const float miny,
+ const float maxx,
+ const float maxy)
{
- float text[4];
- UI_GetThemeColor4fv(TH_TEXT, text);
+ const float ufac = U.pixelsize;
+ float icon_border[4];
+ UI_GetThemeColor4fv(TH_TEXT, icon_border);
+ icon_border[3] = 0.6f;
- copy_v3_v3(icon_color, text);
- icon_color[3] = 0.4f;
- copy_v3_v3(icon_border, text);
- icon_border[3] = 0.2f;
+ /* border around it */
+ UI_draw_roundbox_corner_set(UI_CNR_ALL);
+ UI_draw_roundbox_aa(
+ false, minx + ufac, miny + ufac, maxx - ufac, maxy - ufac, UI_UNIT_Y /
4.0f, icon_border);
+ GPU_blend(true); /* Roundbox disables. */
}
+ static void outliner_draw_active_highlight(const float minx,
+ const float miny,
+ const float maxx,
+ const float maxy,
+ const float ufac,
+ const float icon_color[4],
+ const float icon_border[4])
+ {
+ UI_draw_roundbox_corner_set(UI_CNR_ALL);
+ UI_draw_roundbox_aa(true, minx, miny + ufac, maxx, maxy - ufac, UI_UNIT_Y /
4.0f, icon_color);
+
+ /* border around it */
+ UI_draw_roundbox_aa(false, minx, miny + ufac, maxx, maxy - ufac, UI_UNIT_Y
/ 4.0f, icon_border);
+ GPU_blend(true); /* Roundbox disables. */
+ }
+
static void outliner_draw_iconrow_doit(uiBlock *block,
TreeElement *te,
const uiFontStyle *fstyle,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
