diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-28 09:17:15 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-28 09:17:15 +0300 |
commit | 7bf8d8b3c89cfda3245c1e36e03279c1c970740b (patch) | |
tree | 2798d49b84cbe33993d2526bc463f44791c29183 /source/blender/editors/space_graph | |
parent | 8d81a3da37c45d2b61f1616522c7540445312604 (diff) |
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.
Diffstat (limited to 'source/blender/editors/space_graph')
-rw-r--r-- | source/blender/editors/space_graph/graph_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_graph/space_graph.c | 6 |
2 files changed, 4 insertions, 4 deletions
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); |