Page MenuHome
Differential D2337 Diff 7746 source/blender/editors/space_outliner/outliner_draw.c

Changeset View

Standalone View

View Options

source/blender/editors/space_outliner/outliner_draw.c

Context not available.
float ufac = UI_UNIT_X / 20.0f; float ufac = UI_UNIT_X / 20.0f;
UI_draw_roundbox_corner_set(UI_CNR_ALL); UI_draw_roundbox_corner_set(UI_CNR_ALL);
glColor4ub(255, 255, 255, 100); float color[4] = {1.f, 1.f, 1.f, 0.4f};
merwinUnsubmitted
Not Done
Inline Actions

Use 1.0f as style guide suggests, here and in other places.

merwin: Use 1.0f as style guide suggests, here and in other places.
UI_draw_roundbox( UI_draw_roundbox(
(float) *offsx - 1.0f * ufac, (float) *offsx - 1.0f * ufac,
(float)ys + 1.0f * ufac, (float)ys + 1.0f * ufac,
(float)*offsx + UI_UNIT_X - 2.0f * ufac, (float)*offsx + UI_UNIT_X - 2.0f * ufac,
(float)ys + UI_UNIT_Y - ufac, (float)ys + UI_UNIT_Y - ufac,
(float)UI_UNIT_Y / 2.0f - ufac); (float)UI_UNIT_Y / 2.0f - ufac,
color);
glEnable(GL_BLEND); /* roundbox disables */ glEnable(GL_BLEND); /* roundbox disables */
} }
Context not available.
float ufac = UI_UNIT_X / 20.0f; float ufac = UI_UNIT_X / 20.0f;
int offsx = 0; int offsx = 0;
eOLDrawState active = OL_DRAWSEL_NONE; eOLDrawState active = OL_DRAWSEL_NONE;
float color[4];
tselem = TREESTORE(te); tselem = TREESTORE(te);
if (*starty + 2 * UI_UNIT_Y >= ar->v2d.cur.ymin && *starty <= ar->v2d.cur.ymax) { if (*starty + 2 * UI_UNIT_Y >= ar->v2d.cur.ymin && *starty <= ar->v2d.cur.ymax) {
int xmax = ar->v2d.cur.xmax; int xmax = ar->v2d.cur.xmax;
unsigned char alpha = 128; float alpha = 0.5f;
if ((tselem->flag & TSE_TEXTBUT) && (*te_edit == NULL)) { if ((tselem->flag & TSE_TEXTBUT) && (*te_edit == NULL)) {
*te_edit = te; *te_edit = te;
Context not available.
if (tselem->type == 0) { if (tselem->type == 0) {
if (te->idcode == ID_SCE) { if (te->idcode == ID_SCE) {
if (tselem->id == (ID *)scene) { if (tselem->id == (ID *)scene) {
glColor4ub(255, 255, 255, alpha); rgba_float_args_set(color, 1.0f, 1.f, 1.f, alpha);
active = OL_DRAWSEL_ACTIVE; active = OL_DRAWSEL_ACTIVE;
} }
} }
Context not available.
if (group_select_flag(gr)) { if (group_select_flag(gr)) {
char col[4]; char col[4];
UI_GetThemeColorType4ubv(TH_SELECT, SPACE_VIEW3D, col); UI_GetThemeColorType4ubv(TH_SELECT, SPACE_VIEW3D, col);
col[3] = alpha; rgba_float_args_set(color, (float)col[0] / 255, (float)col[1] / 255, (float)col[2] / 255, alpha);
glColor4ubv((GLubyte *)col);
active = OL_DRAWSEL_ACTIVE; active = OL_DRAWSEL_ACTIVE;
} }
Context not available.
UI_GetThemeColorType4ubv(TH_SELECT, SPACE_VIEW3D, col); UI_GetThemeColorType4ubv(TH_SELECT, SPACE_VIEW3D, col);
col[3] = alpha; col[3] = alpha;
} }
rgba_float_args_set(color, (float)col[0] / 255, (float)col[1] / 255, (float)col[2] / 255, alpha);
glColor4ubv((GLubyte *)col);
} }
} }
else if (scene->obedit && scene->obedit->data == tselem->id) { else if (scene->obedit && scene->obedit->data == tselem->id) {
glColor4ub(255, 255, 255, alpha); rgba_float_args_set(color, 1.0f, 1.f, 1.f, alpha);
active = OL_DRAWSEL_ACTIVE; active = OL_DRAWSEL_ACTIVE;
} }
else { else {
if (tree_element_active(C, scene, soops, te, OL_SETSEL_NONE, false)) { if (tree_element_active(C, scene, soops, te, OL_SETSEL_NONE, false)) {
glColor4ub(220, 220, 255, alpha); rgba_float_args_set(color, 0.85f, 0.85f, 1.f, alpha);
active = OL_DRAWSEL_ACTIVE; active = OL_DRAWSEL_ACTIVE;
} }
} }
Context not available.
if (tree_element_type_active(NULL, scene, soops, te, tselem, OL_SETSEL_NONE, false) != OL_DRAWSEL_NONE) { if (tree_element_type_active(NULL, scene, soops, te, tselem, OL_SETSEL_NONE, false) != OL_DRAWSEL_NONE) {
active = OL_DRAWSEL_ACTIVE; active = OL_DRAWSEL_ACTIVE;
} }
glColor4ub(220, 220, 255, alpha); rgba_float_args_set(color, 0.85f, 0.85f, 1.f, alpha);
} }
/* active circle */ /* active circle */
Context not available.
(float)*starty + 1.0f * ufac, (float)*starty + 1.0f * ufac,
(float)startx + 2.0f * UI_UNIT_X - 2.0f * ufac, (float)startx + 2.0f * UI_UNIT_X - 2.0f * ufac,
(float)*starty + UI_UNIT_Y - 1.0f * ufac, (float)*starty + UI_UNIT_Y - 1.0f * ufac,
UI_UNIT_Y / 2.0f - 1.0f * ufac); UI_UNIT_Y / 2.0f - 1.0f * ufac, color);
glEnable(GL_BLEND); /* roundbox disables it */ glEnable(GL_BLEND); /* roundbox disables it */
te->flag |= TE_ACTIVE; // for lookup in display hierarchies te->flag |= TE_ACTIVE; // for lookup in display hierarchies
Context not available.