From 7bf8d8b3c89cfda3245c1e36e03279c1c970740b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 28 May 2019 16:17:15 +1000 Subject: Cleanup: use time scrub instead of scrubbing Renaming was only done to ED_time_scrub_ui.h, function names and struct members used term 'scrubbing' which is ambiguous. --- release/datafiles/userdef/userdef_default_theme.c | 10 ++--- .../keyconfig/keymap_data/blender_default.py | 12 +++--- .../blender/blenloader/intern/versioning_userdef.c | 10 ++--- source/blender/editors/animation/anim_markers.c | 2 +- source/blender/editors/animation/time_scrub_ui.c | 46 +++++++++++----------- source/blender/editors/include/ED_anim_api.h | 4 +- source/blender/editors/include/ED_time_scrub_ui.h | 22 +++++------ source/blender/editors/include/UI_resources.h | 2 +- source/blender/editors/include/UI_view2d.h | 2 +- source/blender/editors/interface/resources.c | 4 +- source/blender/editors/interface/view2d.c | 2 +- source/blender/editors/screen/area.c | 6 +-- source/blender/editors/space_action/space_action.c | 4 +- source/blender/editors/space_clip/clip_intern.h | 2 +- source/blender/editors/space_clip/space_clip.c | 10 ++--- source/blender/editors/space_graph/graph_edit.c | 2 +- source/blender/editors/space_graph/space_graph.c | 6 +-- source/blender/editors/space_nla/space_nla.c | 4 +- .../editors/space_sequencer/sequencer_draw.c | 4 +- source/blender/makesdna/DNA_userdef_types.h | 2 +- source/blender/makesdna/intern/dna_rename_defs.h | 1 + source/blender/makesrna/intern/rna_userdef.c | 10 ++--- 22 files changed, 84 insertions(+), 83 deletions(-) diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index b5cab405826..e1794495ee6 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -428,7 +428,7 @@ const bTheme U_theme_default = { .vertex = RGBA(0x000000ff), .vertex_select = RGBA(0xff8500ff), .cframe = RGBA(0x5680c2ff), - .scrubbing_background = RGBA(0x292929e6), + .time_scrub_background = RGBA(0x292929e6), .lastsel_point = RGBA(0xffffffff), .handle_auto = RGBA(0x909000ff), .handle_vect = RGBA(0x409030ff), @@ -515,7 +515,7 @@ const bTheme U_theme_default = { .strip = RGBA(0x1a151580), .strip_select = RGBA(0xff8c00cc), .cframe = RGBA(0x5680c2ff), - .scrubbing_background = RGBA(0x292929e6), + .time_scrub_background = RGBA(0x292929e6), .ds_channel = RGBA(0x0f2c4d24), .ds_subchannel = RGBA(0x143e6624), .ds_ipoline = RGBA(0x94e575cc), @@ -569,7 +569,7 @@ const bTheme U_theme_default = { .strip = RGBA(0x0c0a0a80), .strip_select = RGBA(0xff8c00ff), .cframe = RGBA(0x5680c2ff), - .scrubbing_background = RGBA(0x292929e6), + .time_scrub_background = RGBA(0x292929e6), .ds_channel = RGBA(0x5a85b2ff), .ds_subchannel = RGBA(0x7d98b3ff), .keyborder = RGBA(0x000000ff), @@ -616,7 +616,7 @@ const bTheme U_theme_default = { .vertex_select = RGBA(0xff8500ff), .bone_pose = RGBA(0x50c8ff50), .cframe = RGBA(0x5680c2ff), - .scrubbing_background = RGBA(0x292929e6), + .time_scrub_background = RGBA(0x292929e6), .vertex_size = 3, .outline_width = 1, .facedot_size = 4, @@ -894,7 +894,7 @@ const bTheme U_theme_default = { .strip = RGBA(0x0c0a0a80), .strip_select = RGBA(0xff8c00ff), .cframe = RGBA(0x5680c2ff), - .scrubbing_background = RGBA(0x292929e6), + .time_scrub_background = RGBA(0x292929e6), .handle_auto = RGBA(0x909000ff), .handle_align = RGBA(0x803060ff), .handle_sel_auto = RGBA(0xf0ff40ff), diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index cba0ec88c19..2935b397326 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -1261,10 +1261,10 @@ def km_markers(params): return keymap -def km_scrubbing(params): +def km_time_scrub(params): items = [] keymap = ( - "Scrubbing", + "Time Scrub", {"space_type": 'EMPTY', "region_type": 'WINDOW'}, {"items": items}, ) @@ -1276,10 +1276,10 @@ def km_scrubbing(params): return keymap -def km_scrubbing_clip(params): +def km_time_scrub_clip(params): items = [] keymap = ( - "Clip Scrubbing", + "Clip Time Scrub", {"space_type": 'CLIP_EDITOR', "region_type": 'PREVIEW'}, {"items": items}, ) @@ -5760,8 +5760,8 @@ def generate_keymaps(params=None): km_view3d(params), km_mask_editing(params), km_markers(params), - km_scrubbing(params), - km_scrubbing_clip(params), + km_time_scrub(params), + km_time_scrub_clip(params), km_graph_editor_generic(params), km_graph_editor(params), km_image_generic(params), diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index d1cb9d32212..89f4d86b1b8 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -127,11 +127,11 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) FROM_DEFAULT_V4_UCHAR(space_sequencer.text); FROM_DEFAULT_V4_UCHAR(space_clip.text); - FROM_DEFAULT_V4_UCHAR(space_graph.scrubbing_background); - FROM_DEFAULT_V4_UCHAR(space_action.scrubbing_background); - FROM_DEFAULT_V4_UCHAR(space_nla.scrubbing_background); - FROM_DEFAULT_V4_UCHAR(space_sequencer.scrubbing_background); - FROM_DEFAULT_V4_UCHAR(space_clip.scrubbing_background); + FROM_DEFAULT_V4_UCHAR(space_graph.time_scrub_background); + FROM_DEFAULT_V4_UCHAR(space_action.time_scrub_background); + FROM_DEFAULT_V4_UCHAR(space_nla.time_scrub_background); + FROM_DEFAULT_V4_UCHAR(space_sequencer.time_scrub_background); + FROM_DEFAULT_V4_UCHAR(space_clip.time_scrub_background); } if (!USER_VERSION_ATLEAST(280, 67)) { diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 876bc9ae3e4..90632da8a7c 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -482,7 +482,7 @@ static void draw_markers_background(rctf *rect) immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); unsigned char shade[4]; - UI_GetThemeColor4ubv(TH_SCRUBBING_BACKGROUND, shade); + UI_GetThemeColor4ubv(TH_TIME_SCRUB_BACKGROUND, shade); immUniformColor4ubv(shade); diff --git a/source/blender/editors/animation/time_scrub_ui.c b/source/blender/editors/animation/time_scrub_ui.c index 37e7eab74d4..70a9b7ba1fa 100644 --- a/source/blender/editors/animation/time_scrub_ui.c +++ b/source/blender/editors/animation/time_scrub_ui.c @@ -46,12 +46,12 @@ #include "RNA_access.h" -static void get_scrubbing_region_rect(const ARegion *ar, rcti *rect) +static void get_time_scrub_region_rect(const ARegion *ar, rcti *rect) { rect->xmin = 0; rect->xmax = ar->winx; rect->ymax = ar->winy; - rect->ymin = rect->ymax - UI_SCRUBBING_MARGIN_Y; + rect->ymin = rect->ymax - UI_TIME_SCRUB_MARGIN_Y; } static int get_centered_text_y(const rcti *rect) @@ -64,7 +64,7 @@ static void draw_background(const rcti *rect) uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT); immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); - immUniformThemeColor(TH_SCRUBBING_BACKGROUND); + immUniformThemeColor(TH_TIME_SCRUB_BACKGROUND); GPU_blend(true); GPU_blend_set_func_separate( @@ -91,7 +91,7 @@ static void get_current_time_str( static void draw_current_frame(const Scene *scene, bool display_seconds, const View2D *v2d, - const rcti *scrubbing_region_rect, + const rcti *scrub_region_rect, int current_frame) { const uiFontStyle *fstyle = UI_FSTYLE_WIDGET; @@ -111,9 +111,9 @@ static void draw_current_frame(const Scene *scene, UI_draw_roundbox_3fvAlpha(true, frame_x - box_width / 2 + U.pixelsize / 2, - scrubbing_region_rect->ymin + box_padding, + scrub_region_rect->ymin + box_padding, frame_x + box_width / 2 + U.pixelsize / 2, - scrubbing_region_rect->ymax - box_padding, + scrub_region_rect->ymax - box_padding, 4 * UI_DPI_FAC, bg_color, 1.0f); @@ -121,36 +121,36 @@ static void draw_current_frame(const Scene *scene, UI_GetThemeColorShade4fv(TH_CFRAME, 5, bg_color); UI_draw_roundbox_aa(false, frame_x - box_width / 2 + U.pixelsize / 2, - scrubbing_region_rect->ymin + box_padding, + scrub_region_rect->ymin + box_padding, frame_x + box_width / 2 + U.pixelsize / 2, - scrubbing_region_rect->ymax - box_padding, + scrub_region_rect->ymax - box_padding, 4 * UI_DPI_FAC, bg_color); UI_fontstyle_draw_simple(fstyle, frame_x - text_width / 2 + U.pixelsize / 2, - get_centered_text_y(scrubbing_region_rect), + get_centered_text_y(scrub_region_rect), frame_str, color); } -void ED_scrubbing_draw(const ARegion *ar, - const Scene *scene, - bool display_seconds, - bool discrete_frames) +void ED_time_scrub_draw(const ARegion *ar, + const Scene *scene, + bool display_seconds, + bool discrete_frames) { const View2D *v2d = &ar->v2d; GPU_matrix_push_projection(); wmOrtho2_region_pixelspace(ar); - rcti scrubbing_region_rect; - get_scrubbing_region_rect(ar, &scrubbing_region_rect); + rcti scrub_region_rect; + get_time_scrub_region_rect(ar, &scrub_region_rect); - draw_background(&scrubbing_region_rect); + draw_background(&scrub_region_rect); - rcti numbers_rect = scrubbing_region_rect; - numbers_rect.ymin = get_centered_text_y(&scrubbing_region_rect) - 4 * UI_DPI_FAC; + rcti numbers_rect = scrub_region_rect; + numbers_rect.ymin = get_centered_text_y(&scrub_region_rect) - 4 * UI_DPI_FAC; if (discrete_frames) { UI_view2d_draw_scale_x__discrete_frames_or_seconds( ar, v2d, &numbers_rect, scene, display_seconds, TH_TEXT); @@ -160,19 +160,19 @@ void ED_scrubbing_draw(const ARegion *ar, ar, v2d, &numbers_rect, scene, display_seconds, TH_TEXT); } - draw_current_frame(scene, display_seconds, v2d, &scrubbing_region_rect, scene->r.cfra); + draw_current_frame(scene, display_seconds, v2d, &scrub_region_rect, scene->r.cfra); GPU_matrix_pop_projection(); } -bool ED_event_in_scrubbing_region(const ARegion *ar, const wmEvent *event) +bool ED_time_scrub_event_in_region(const ARegion *ar, const wmEvent *event) { rcti rect = ar->winrct; - rect.ymin = rect.ymax - UI_SCRUBBING_MARGIN_Y; + rect.ymin = rect.ymax - UI_TIME_SCRUB_MARGIN_Y; return BLI_rcti_isect_pt(&rect, event->x, event->y); } -void ED_channel_search_draw(const bContext *C, ARegion *ar, bDopeSheet *dopesheet) +void ED_time_scrub_channel_search_draw(const bContext *C, ARegion *ar, bDopeSheet *dopesheet) { GPU_matrix_push_projection(); wmOrtho2_region_pixelspace(ar); @@ -180,7 +180,7 @@ void ED_channel_search_draw(const bContext *C, ARegion *ar, bDopeSheet *dopeshee rcti rect; rect.xmin = 0; rect.xmax = ceilf(ar->sizex * UI_DPI_FAC); - rect.ymin = ar->sizey * UI_DPI_FAC - UI_SCRUBBING_MARGIN_Y; + rect.ymin = ar->sizey * UI_DPI_FAC - UI_TIME_SCRUB_MARGIN_Y; rect.ymax = ceilf(ar->sizey * UI_DPI_FAC); uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT); diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index cd68981dee3..7a29e6b5e66 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -404,7 +404,7 @@ typedef enum eAnimFilter_Flags { /* channel heights */ #define ACHANNEL_FIRST_TOP(ac) \ - (UI_view2d_scale_get_y(&(ac)->ar->v2d) * -UI_SCRUBBING_MARGIN_Y - ACHANNEL_SKIP) + (UI_view2d_scale_get_y(&(ac)->ar->v2d) * -UI_TIME_SCRUB_MARGIN_Y - ACHANNEL_SKIP) #define ACHANNEL_HEIGHT(ac) (0.8f * (ac)->yscale_fac * U.widget_unit) #define ACHANNEL_SKIP (0.1f * U.widget_unit) #define ACHANNEL_STEP(ac) (ACHANNEL_HEIGHT(ac) + ACHANNEL_SKIP) @@ -422,7 +422,7 @@ typedef enum eAnimFilter_Flags { /* NLA channel heights */ #define NLACHANNEL_FIRST_TOP(ac) \ - (UI_view2d_scale_get_y(&(ac)->ar->v2d) * -UI_SCRUBBING_MARGIN_Y - NLACHANNEL_SKIP) + (UI_view2d_scale_get_y(&(ac)->ar->v2d) * -UI_TIME_SCRUB_MARGIN_Y - NLACHANNEL_SKIP) #define NLACHANNEL_HEIGHT(snla) \ ((snla && (snla->flag & SNLA_NOSTRIPCURVES)) ? (0.8f * U.widget_unit) : (1.2f * U.widget_unit)) #define NLACHANNEL_SKIP (0.1f * U.widget_unit) diff --git a/source/blender/editors/include/ED_time_scrub_ui.h b/source/blender/editors/include/ED_time_scrub_ui.h index a2e3098e949..b43e674224c 100644 --- a/source/blender/editors/include/ED_time_scrub_ui.h +++ b/source/blender/editors/include/ED_time_scrub_ui.h @@ -21,23 +21,23 @@ * \ingroup editors */ -#ifndef __ED_SCRUBBING_H__ -#define __ED_SCRUBBING_H__ +#ifndef __ED_TIME_SCRUB_UI_H__ +#define __ED_TIME_SCRUB_UI_H__ struct View2DGrid; struct bContext; struct bDopeSheet; struct wmEvent; -void ED_scrubbing_draw(const struct ARegion *ar, - const struct Scene *scene, - bool display_seconds, - bool discrete_frames); +void ED_time_scrub_draw(const struct ARegion *ar, + const struct Scene *scene, + bool display_seconds, + bool discrete_frames); -bool ED_event_in_scrubbing_region(const struct ARegion *ar, const struct wmEvent *event); +bool ED_time_scrub_event_in_region(const struct ARegion *ar, const struct wmEvent *event); -void ED_channel_search_draw(const struct bContext *C, - struct ARegion *ar, - struct bDopeSheet *dopesheet); +void ED_time_scrub_channel_search_draw(const struct bContext *C, + struct ARegion *ar, + struct bDopeSheet *dopesheet); -#endif /* __ED_SCRUBBING_H__ */ +#endif /* __ED_TIME_SCRUB_UI_H__ */ diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 6dc632921ad..db6bb35560d 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -105,7 +105,7 @@ typedef enum ThemeColorID { TH_FACE_DOT, TH_FACEDOT_SIZE, TH_CFRAME, - TH_SCRUBBING_BACKGROUND, + TH_TIME_SCRUB_BACKGROUND, TH_TIME_KEYFRAME, TH_TIME_GP_KEYFRAME, TH_NURB_ULINE, diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.h index d03d4b1b4f5..42ac3bb30d8 100644 --- a/source/blender/editors/include/UI_view2d.h +++ b/source/blender/editors/include/UI_view2d.h @@ -260,6 +260,6 @@ void UI_view2d_smooth_view(struct bContext *C, const int smooth_viewtx); #define UI_MARKER_MARGIN_Y (42 * UI_DPI_FAC) -#define UI_SCRUBBING_MARGIN_Y (23 * UI_DPI_FAC) +#define UI_TIME_SCRUB_MARGIN_Y (23 * UI_DPI_FAC) #endif /* __UI_VIEW2D_H__ */ diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 06acf59e07c..26beb08dd28 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -309,8 +309,8 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) case TH_GRID: cp = ts->grid; break; - case TH_SCRUBBING_BACKGROUND: - cp = ts->scrubbing_background; + case TH_TIME_SCRUB_BACKGROUND: + cp = ts->time_scrub_background; break; case TH_VIEW_OVERLAY: cp = ts->view_overlay; diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index f2d4faff479..36b984e229b 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -190,7 +190,7 @@ static void view2d_masks(View2D *v2d, bool check_scrollers, const rcti *mask_scr * also have the scrubbing area at the top. * So the scrollbar has to move down a bit. */ if (scroll & V2D_SCROLL_VERTICAL_HANDLES) { - v2d->vert.ymax -= UI_SCRUBBING_MARGIN_Y; + v2d->vert.ymax -= UI_TIME_SCRUB_MARGIN_Y; } /* horizontal scroller */ diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 9b35c809d5a..83058f2bc95 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1612,9 +1612,9 @@ static void ed_default_handlers( keymap = WM_keymap_ensure(wm->defaultconf, "Markers", 0, 0); WM_event_add_keymap_handler_poll(handlers, keymap, event_in_markers_region); - /* time-scrubbing */ - keymap = WM_keymap_ensure(wm->defaultconf, "Scrubbing", 0, 0); - WM_event_add_keymap_handler_poll(handlers, keymap, ED_event_in_scrubbing_region); + /* time-scrub */ + keymap = WM_keymap_ensure(wm->defaultconf, "Time Scrub", 0, 0); + WM_event_add_keymap_handler_poll(handlers, keymap, ED_time_scrub_event_in_region); /* frame changing and timeline operators (for time spaces) */ keymap = WM_keymap_ensure(wm->defaultconf, "Animation", 0, 0); diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c index 972f19bb643..3c879b03126 100644 --- a/source/blender/editors/space_action/space_action.c +++ b/source/blender/editors/space_action/space_action.c @@ -237,7 +237,7 @@ static void action_main_region_draw(const bContext *C, ARegion *ar) UI_view2d_view_restore(C); /* scrubbing region */ - ED_scrubbing_draw(ar, scene, saction->flag & SACTION_DRAWTIME, true); + ED_time_scrub_draw(ar, scene, saction->flag & SACTION_DRAWTIME, true); /* scrollers */ scrollers = UI_view2d_scrollers_calc(v2d, NULL); @@ -281,7 +281,7 @@ static void action_channel_region_draw(const bContext *C, ARegion *ar) } /* channel filter next to scrubbing area */ - ED_channel_search_draw(C, ar, ac.ads); + ED_time_scrub_channel_search_draw(C, ar, ac.ads); /* reset view matrix */ UI_view2d_view_restore(C); diff --git a/source/blender/editors/space_clip/clip_intern.h b/source/blender/editors/space_clip/clip_intern.h index 081515ca4bc..7683823a79f 100644 --- a/source/blender/editors/space_clip/clip_intern.h +++ b/source/blender/editors/space_clip/clip_intern.h @@ -35,7 +35,7 @@ struct bContext; struct wmOperatorType; /* channel heights */ -#define CHANNEL_FIRST (-UI_SCRUBBING_MARGIN_Y - CHANNEL_HEIGHT_HALF - CHANNEL_SKIP) +#define CHANNEL_FIRST (-UI_TIME_SCRUB_MARGIN_Y - CHANNEL_HEIGHT_HALF - CHANNEL_SKIP) #define CHANNEL_HEIGHT (0.8f * U.widget_unit) #define CHANNEL_HEIGHT_HALF (0.4f * U.widget_unit) #define CHANNEL_SKIP (0.1f * U.widget_unit) diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c index 88c4c7735af..4df435270ce 100644 --- a/source/blender/editors/space_clip/space_clip.c +++ b/source/blender/editors/space_clip/space_clip.c @@ -1007,8 +1007,8 @@ static void clip_preview_region_init(wmWindowManager *wm, ARegion *ar) keymap = WM_keymap_ensure(wm->defaultconf, "Clip", SPACE_CLIP, 0); WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Clip Scrubbing", SPACE_CLIP, RGN_TYPE_PREVIEW); - WM_event_add_keymap_handler_poll(&ar->handlers, keymap, ED_event_in_scrubbing_region); + keymap = WM_keymap_ensure(wm->defaultconf, "Clip Time Scrub", SPACE_CLIP, RGN_TYPE_PREVIEW); + WM_event_add_keymap_handler_poll(&ar->handlers, keymap, ED_time_scrub_event_in_region); keymap = WM_keymap_ensure(wm->defaultconf, "Clip Graph Editor", SPACE_CLIP, 0); WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap); @@ -1048,7 +1048,7 @@ static void graph_region_draw(const bContext *C, ARegion *ar) UI_view2d_view_restore(C); /* time-scrubbing */ - ED_scrubbing_draw(ar, scene, sc->flag & SC_SHOW_SECONDS, true); + ED_time_scrub_draw(ar, scene, sc->flag & SC_SHOW_SECONDS, true); /* scrollers */ scrollers = UI_view2d_scrollers_calc(v2d, NULL); @@ -1062,7 +1062,7 @@ static void graph_region_draw(const bContext *C, ARegion *ar) 0, 15 * UI_DPI_FAC, 15 * UI_DPI_FAC, - UI_DPI_FAC * ar->sizey - UI_SCRUBBING_MARGIN_Y); + UI_DPI_FAC * ar->sizey - UI_TIME_SCRUB_MARGIN_Y); UI_view2d_draw_scale_y__values(ar, v2d, &rect, TH_TEXT); } } @@ -1102,7 +1102,7 @@ static void dopesheet_region_draw(const bContext *C, ARegion *ar) UI_view2d_view_restore(C); /* time-scrubbing */ - ED_scrubbing_draw(ar, scene, sc->flag & SC_SHOW_SECONDS, true); + ED_time_scrub_draw(ar, scene, sc->flag & SC_SHOW_SECONDS, true); /* scrollers */ scrollers = UI_view2d_scrollers_calc(v2d, NULL); diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index b3fafa09256..b68efdc0ea0 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -287,7 +287,7 @@ static int graphkeys_viewall(bContext *C, BLI_rctf_scale(&cur_new, 1.1f); /* Take regions into account, that could block the view. */ - float pad_top = UI_SCRUBBING_MARGIN_Y; + float pad_top = UI_TIME_SCRUB_MARGIN_Y; float pad_bottom = 0; if (!BLI_listbase_is_empty(ED_context_get_markers(C))) { pad_bottom = UI_MARKER_MARGIN_Y; diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c index 4e131c653f8..6c5ebf77bf4 100644 --- a/source/blender/editors/space_graph/space_graph.c +++ b/source/blender/editors/space_graph/space_graph.c @@ -314,7 +314,7 @@ static void graph_main_region_draw(const bContext *C, ARegion *ar) UI_view2d_view_restore(C); /* time-scrubbing */ - ED_scrubbing_draw(ar, scene, display_seconds, false); + ED_time_scrub_draw(ar, scene, display_seconds, false); /* scrollers */ // FIXME: args for scrollers depend on the type of data being shown... @@ -329,7 +329,7 @@ static void graph_main_region_draw(const bContext *C, ARegion *ar) 0, 15 * UI_DPI_FAC, 15 * UI_DPI_FAC, - UI_DPI_FAC * ar->sizey - UI_SCRUBBING_MARGIN_Y); + UI_DPI_FAC * ar->sizey - UI_TIME_SCRUB_MARGIN_Y); UI_view2d_draw_scale_y__values(ar, v2d, &rect, TH_SCROLL_TEXT); } } @@ -376,7 +376,7 @@ static void graph_channel_region_draw(const bContext *C, ARegion *ar) } /* channel filter next to scrubbing area */ - ED_channel_search_draw(C, ar, ac.ads); + ED_time_scrub_channel_search_draw(C, ar, ac.ads); /* reset view matrix */ UI_view2d_view_restore(C); diff --git a/source/blender/editors/space_nla/space_nla.c b/source/blender/editors/space_nla/space_nla.c index 4b7dfe5d653..3bdd2804efc 100644 --- a/source/blender/editors/space_nla/space_nla.c +++ b/source/blender/editors/space_nla/space_nla.c @@ -205,7 +205,7 @@ static void nla_channel_region_draw(const bContext *C, ARegion *ar) } /* channel filter next to scrubbing area */ - ED_channel_search_draw(C, ar, ac.ads); + ED_time_scrub_channel_search_draw(C, ar, ac.ads); /* reset view matrix */ UI_view2d_view_restore(C); @@ -290,7 +290,7 @@ static void nla_main_region_draw(const bContext *C, ARegion *ar) /* reset view matrix */ UI_view2d_view_restore(C); - ED_scrubbing_draw(ar, scene, snla->flag & SNLA_DRAWTIME, true); + ED_time_scrub_draw(ar, scene, snla->flag & SNLA_DRAWTIME, true); /* scrollers */ scrollers = UI_view2d_scrollers_calc(v2d, NULL); diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index fb875c8c4a4..a59cc36f28e 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -2087,7 +2087,7 @@ void draw_timeline_seq(const bContext *C, ARegion *ar) UI_view2d_view_restore(C); /* scrubbing region */ - ED_scrubbing_draw(ar, scene, !(sseq->flag & SEQ_DRAWFRAMES), true); + ED_time_scrub_draw(ar, scene, !(sseq->flag & SEQ_DRAWFRAMES), true); /* scrollers */ scrollers = UI_view2d_scrollers_calc(v2d, NULL); @@ -2101,7 +2101,7 @@ void draw_timeline_seq(const bContext *C, ARegion *ar) 0, 15 * UI_DPI_FAC, 15 * UI_DPI_FAC, - UI_DPI_FAC * ar->sizey - UI_SCRUBBING_MARGIN_Y); + UI_DPI_FAC * ar->sizey - UI_TIME_SCRUB_MARGIN_Y); UI_view2d_draw_scale_y__block(ar, v2d, &rect, TH_SCROLL_TEXT); } } diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 9cab63dbfeb..fa12de56364 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -283,7 +283,7 @@ typedef struct ThemeSpace { char cframe[4]; char time_keyframe[4], time_gp_keyframe[4]; char freestyle_edge_mark[4], freestyle_face_mark[4]; - char scrubbing_background[4]; + char time_scrub_background[4]; char _pad5[4]; char nurb_uline[4], nurb_vline[4]; diff --git a/source/blender/makesdna/intern/dna_rename_defs.h b/source/blender/makesdna/intern/dna_rename_defs.h index 3aa0ff4b28a..0bc35c15e35 100644 --- a/source/blender/makesdna/intern/dna_rename_defs.h +++ b/source/blender/makesdna/intern/dna_rename_defs.h @@ -75,6 +75,7 @@ DNA_STRUCT_RENAME_ELEM(Object, size, scale) DNA_STRUCT_RENAME_ELEM(ParticleSettings, dup_group, instance_collection) DNA_STRUCT_RENAME_ELEM(ParticleSettings, dup_ob, instance_object) DNA_STRUCT_RENAME_ELEM(ParticleSettings, dupliweights, instance_weights) +DNA_STRUCT_RENAME_ELEM(ThemeSpace, scrubbing_background, time_scrub_background) DNA_STRUCT_RENAME_ELEM(View3D, far, clip_end) DNA_STRUCT_RENAME_ELEM(View3D, near, clip_start) DNA_STRUCT_RENAME_ELEM(bPoseChannel, curveInX, curve_in_x) diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index b53abacadf2..d06e938b262 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -2183,7 +2183,7 @@ static void rna_def_userdef_theme_space_graph(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Current Frame", ""); RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); - prop = RNA_def_property(srna, "scrubbing_background", PROP_FLOAT, PROP_COLOR_GAMMA); + prop = RNA_def_property(srna, "time_scrub_background", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_array(prop, 4); RNA_def_property_ui_text(prop, "Scrubbing/Markers Region", ""); RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); @@ -2898,7 +2898,7 @@ static void rna_def_userdef_theme_space_seq(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Current Frame", ""); RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); - prop = RNA_def_property(srna, "scrubbing_background", PROP_FLOAT, PROP_COLOR_GAMMA); + prop = RNA_def_property(srna, "time_scrub_background", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_array(prop, 4); RNA_def_property_ui_text(prop, "Scrubbing/Markers Region", ""); RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); @@ -2960,7 +2960,7 @@ static void rna_def_userdef_theme_space_action(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Current Frame", ""); RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); - prop = RNA_def_property(srna, "scrubbing_background", PROP_FLOAT, PROP_COLOR_GAMMA); + prop = RNA_def_property(srna, "time_scrub_background", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_array(prop, 4); RNA_def_property_ui_text(prop, "Scrubbing/Markers Region", ""); RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); @@ -3258,7 +3258,7 @@ static void rna_def_userdef_theme_space_nla(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Current Frame", ""); RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); - prop = RNA_def_property(srna, "scrubbing_background", PROP_FLOAT, PROP_COLOR_GAMMA); + prop = RNA_def_property(srna, "time_scrub_background", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_array(prop, 4); RNA_def_property_ui_text(prop, "Scrubbing/Markers Region", ""); RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); @@ -3367,7 +3367,7 @@ static void rna_def_userdef_theme_space_clip(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Current Frame", ""); RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); - prop = RNA_def_property(srna, "scrubbing_background", PROP_FLOAT, PROP_COLOR_GAMMA); + prop = RNA_def_property(srna, "time_scrub_background", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_array(prop, 4); RNA_def_property_ui_text(prop, "Scrubbing/Markers Region", ""); RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); -- cgit v1.2.3