Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <mail@jlucke.com>2019-05-08 15:10:09 +0300
committerJacques Lucke <mail@jlucke.com>2019-05-08 15:10:09 +0300
commitc79fc710b3f97e5bcf8db59fc358d430617e08c9 (patch)
treee541e7600529c471a366a26e047ed6bc375d9561 /source/blender/editors/screen
parent6950faa24eff7bf756ebed7e3d86e37966cabfc4 (diff)
Keymap: Special keymap for clip editor scrubbing area
Reviewers: sergey Differential Revision: https://developer.blender.org/D4825
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r--source/blender/editors/screen/area.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 6fe2b5eb37d..fe70957890f 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -50,6 +50,7 @@
#include "ED_screen.h"
#include "ED_screen_types.h"
#include "ED_space_api.h"
+#include "ED_scrubbing.h"
#include "GPU_immediate.h"
#include "GPU_immediate_util.h"
@@ -1566,13 +1567,6 @@ static bool event_in_markers_region(const ARegion *ar, const wmEvent *event)
return BLI_rcti_isect_pt(&rect, event->x, event->y);
}
-static bool event_in_scrubbing_region(const ARegion *ar, const wmEvent *event)
-{
- rcti rect = ar->winrct;
- rect.ymin = rect.ymax - UI_SCRUBBING_MARGIN_Y;
- return BLI_rcti_isect_pt(&rect, event->x, event->y);
-}
-
/**
* \param ar: Region, may be NULL when adding handlers for \a sa.
*/
@@ -1620,7 +1614,7 @@ static void ed_default_handlers(
/* time-scrubbing */
keymap = WM_keymap_ensure(wm->defaultconf, "Scrubbing", 0, 0);
- WM_event_add_keymap_handler_poll(handlers, keymap, event_in_scrubbing_region);
+ WM_event_add_keymap_handler_poll(handlers, keymap, ED_event_in_scrubbing_region);
/* frame changing and timeline operators (for time spaces) */
keymap = WM_keymap_ensure(wm->defaultconf, "Animation", 0, 0);