From fa4ab69abf5750857e0b79295b13efa73aef0766 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 15 Feb 2020 10:45:46 +1100 Subject: Cleanup: mixed camel/snake case --- .../editors/animation/anim_channels_defines.c | 8 ++--- source/blender/editors/animation/time_scrub_ui.c | 16 +++++----- source/blender/editors/include/UI_interface.h | 32 ++++++++++---------- source/blender/editors/interface/interface_draw.c | 34 +++++++++++----------- source/blender/editors/space_node/node_draw.c | 16 +++++----- 5 files changed, 53 insertions(+), 53 deletions(-) (limited to 'source') diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 177b8296b55..055c64290db 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -125,7 +125,7 @@ static void acf_generic_root_backdrop(bAnimContext *ac, /* rounded corners on LHS only - top only when expanded, but bottom too when collapsed */ UI_draw_roundbox_corner_set((expanded) ? UI_CNR_TOP_LEFT : (UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT)); - UI_draw_roundbox_3fvAlpha( + UI_draw_roundbox_3fv_alpha( true, offset, yminc, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc, 8, color, 1.0f); } @@ -477,7 +477,7 @@ static void acf_summary_backdrop(bAnimContext *ac, bAnimListElem *ale, float ymi * - special hack: make the top a bit higher, since we are first... */ UI_draw_roundbox_corner_set(UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT); - UI_draw_roundbox_3fvAlpha( + UI_draw_roundbox_3fv_alpha( true, 0, yminc - 2, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc, 8, color, 1.0f); } @@ -884,7 +884,7 @@ static void acf_group_backdrop(bAnimContext *ac, bAnimListElem *ale, float yminc /* rounded corners on LHS only - top only when expanded, but bottom too when collapsed */ UI_draw_roundbox_corner_set(expanded ? UI_CNR_TOP_LEFT : (UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT)); - UI_draw_roundbox_3fvAlpha( + UI_draw_roundbox_3fv_alpha( true, offset, yminc, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc, 8, color, 1.0f); } @@ -1157,7 +1157,7 @@ static void acf_nla_controls_backdrop(bAnimContext *ac, /* rounded corners on LHS only - top only when expanded, but bottom too when collapsed */ UI_draw_roundbox_corner_set(expanded ? UI_CNR_TOP_LEFT : (UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT)); - UI_draw_roundbox_3fvAlpha( + UI_draw_roundbox_3fv_alpha( true, offset, yminc, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc, 5, color, 1.0f); } diff --git a/source/blender/editors/animation/time_scrub_ui.c b/source/blender/editors/animation/time_scrub_ui.c index ae489fb5233..84ef28744b3 100644 --- a/source/blender/editors/animation/time_scrub_ui.c +++ b/source/blender/editors/animation/time_scrub_ui.c @@ -109,14 +109,14 @@ static void draw_current_frame(const Scene *scene, UI_draw_roundbox_corner_set(UI_CNR_ALL); - UI_draw_roundbox_3fvAlpha(true, - frame_x - box_width / 2 + U.pixelsize / 2, - scrub_region_rect->ymin + box_padding, - frame_x + box_width / 2 + U.pixelsize / 2, - scrub_region_rect->ymax - box_padding, - 4 * UI_DPI_FAC, - bg_color, - 1.0f); + UI_draw_roundbox_3fv_alpha(true, + frame_x - box_width / 2 + U.pixelsize / 2, + scrub_region_rect->ymin + box_padding, + frame_x + box_width / 2 + U.pixelsize / 2, + scrub_region_rect->ymax - box_padding, + 4 * UI_DPI_FAC, + bg_color, + 1.0f); UI_GetThemeColorShade4fv(TH_CFRAME, 5, bg_color); UI_draw_roundbox_aa(false, diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index e49d3f6ae53..c8ae4c019e7 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -403,22 +403,22 @@ void UI_draw_roundbox_aa( bool filled, float minx, float miny, float maxx, float maxy, float rad, const float color[4]); void UI_draw_roundbox_4fv( bool filled, float minx, float miny, float maxx, float maxy, float rad, const float col[4]); -void UI_draw_roundbox_3ubAlpha(bool filled, - float minx, - float miny, - float maxx, - float maxy, - float rad, - const unsigned char col[3], - unsigned char alpha); -void UI_draw_roundbox_3fvAlpha(bool filled, - float minx, - float miny, - float maxx, - float maxy, - float rad, - const float col[3], - float alpha); +void UI_draw_roundbox_3ub_alpha(bool filled, + float minx, + float miny, + float maxx, + float maxy, + float rad, + const unsigned char col[3], + unsigned char alpha); +void UI_draw_roundbox_3fv_alpha(bool filled, + float minx, + float miny, + float maxx, + float maxy, + float rad, + const float col[3], + float alpha); void UI_draw_roundbox_shade_x(bool filled, float minx, float miny, diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 0250900759f..b6351ac74af 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -80,14 +80,14 @@ int UI_draw_roundbox_corner_get(void) } #endif -void UI_draw_roundbox_3ubAlpha(bool filled, - float minx, - float miny, - float maxx, - float maxy, - float rad, - const uchar col[3], - uchar alpha) +void UI_draw_roundbox_3ub_alpha(bool filled, + float minx, + float miny, + float maxx, + float maxy, + float rad, + const uchar col[3], + uchar alpha) { float colv[4]; colv[0] = ((float)col[0]) / 255; @@ -97,14 +97,14 @@ void UI_draw_roundbox_3ubAlpha(bool filled, UI_draw_roundbox_4fv(filled, minx, miny, maxx, maxy, rad, colv); } -void UI_draw_roundbox_3fvAlpha(bool filled, - float minx, - float miny, - float maxx, - float maxy, - float rad, - const float col[3], - float alpha) +void UI_draw_roundbox_3fv_alpha(bool filled, + float minx, + float miny, + float maxx, + float maxy, + float rad, + const float col[3], + float alpha) { float colv[4]; colv[0] = col[0]; @@ -1740,7 +1740,7 @@ void ui_draw_but_UNITVEC(uiBut *but, const uiWidgetColors *wcol, const rcti *rec /* backdrop */ UI_draw_roundbox_corner_set(UI_CNR_ALL); - UI_draw_roundbox_3ubAlpha( + UI_draw_roundbox_3ub_alpha( true, rect->xmin, rect->ymin, rect->xmax, rect->ymax, 5.0f, wcol->inner, 255); glCullFace(GL_BACK); diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 4627f233720..7c64255380b 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -1341,14 +1341,14 @@ static void node_draw_hidden(const bContext *C, GPU_blend(true); GPU_line_smooth(true); - UI_draw_roundbox_3fvAlpha(false, - rct->xmin + 1, - rct->ymin + 1, - rct->xmax - 1, - rct->ymax - 1, - hiddenrad, - node->color, - 1.0f); + UI_draw_roundbox_3fv_alpha(false, + rct->xmin + 1, + rct->ymin + 1, + rct->xmax - 1, + rct->ymax - 1, + hiddenrad, + node->color, + 1.0f); GPU_line_smooth(false); GPU_blend(false); -- cgit v1.2.3