diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-02-15 02:45:46 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-02-15 02:45:46 +0300 |
commit | fa4ab69abf5750857e0b79295b13efa73aef0766 (patch) | |
tree | 90f81a992f006eb470a9c01033f740ae6e065c2e /source/blender/editors/animation | |
parent | 92a56bbe6a985905ab748c29f57ab89977e83f9f (diff) |
Cleanup: mixed camel/snake case
Diffstat (limited to 'source/blender/editors/animation')
-rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 8 | ||||
-rw-r--r-- | source/blender/editors/animation/time_scrub_ui.c | 16 |
2 files changed, 12 insertions, 12 deletions
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, |