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/interface | |
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/interface')
-rw-r--r-- | source/blender/editors/interface/resources.c | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/view2d.c | 2 |
2 files changed, 3 insertions, 3 deletions
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 */ |