sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Bugfix #26394

Browse Source 
Using Marker menu (dopesheet) didn't work, the operators themselves
were checking Y coordinate of event.
Handlers also support boundbox checks. For this case it needed a bit
special handling. But works :)
This commit is contained in:
Ton Roosendaal 2011-03-07 18:05:41 +00:00
parent 2818add586
commit aa6c975fa8
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/editors/animation/anim_markers.c
View File

@ -413,9 +413,6 @@ void draw_markers_time(const bContext *C, int flag)
* primary operations of those editors.
*/
/* maximum y-axis value (in region screen-space) that marker events should still be accepted for */
#define ANIMEDIT_MARKER_YAXIS_MAX 30
/* ------------------------ */
/* special poll() which checks if there are selected markers first */
@ -460,15 +457,7 @@ static int ed_markers_opwrap_invoke_custom(bContext *C, wmOperator *op, wmEvent
ScrArea *sa = CTX_wm_area(C);
int retval = OPERATOR_PASS_THROUGH;
/* only timeline view doesn't need calling-location validation as it's the only dedicated view */
if (sa->spacetype != SPACE_TIME) {
/* restrict y-values to within ANIMEDIT_MARKER_YAXIS_MAX of the view's vertical extents, including scrollbars */
if (evt->mval[1] > ANIMEDIT_MARKER_YAXIS_MAX) {
/* not ok... "pass-through" to let normal editor's operators have a chance at tackling this event... */
//printf("MARKER-WRAPPER-DEBUG: event mval[1] = %d, so over accepted tolerance\n", evt->mval[1]);
return OPERATOR_CANCELLED|OPERATOR_PASS_THROUGH;
}
}
/* removed check for Y coord of event, keymap has bounbox now */
/* allow operator to run now */
if (invoke_func)

22
source/blender/editors/screen/area.c
View File

@ -843,7 +843,7 @@ static void region_subwindow(wmWindow *win, ARegion *ar)
wm_subwindow_position(win, ar->swinid, &ar->winrct);
}
static void ed_default_handlers(wmWindowManager *wm, ListBase *handlers, int flag)
static void ed_default_handlers(wmWindowManager *wm, ScrArea *sa, ListBase *handlers, int flag)
{
/* note, add-handler checks if it already exists */
@ -860,8 +860,20 @@ static void ed_default_handlers(wmWindowManager *wm, ListBase *handlers, int fla
if(flag & ED_KEYMAP_MARKERS) {
/* time-markers */
wmKeyMap *keymap= WM_keymap_find(wm->defaultconf, "Markers", 0, 0);
WM_event_add_keymap_handler(handlers, keymap);
// XXX need boundbox check urgently!!!
/* time space only has this keymap, the others get a boundbox restricted map */
if(sa->spacetype!=SPACE_TIME) {
ARegion *ar;
static rcti rect= {0, 10000, 0, 30}; /* same local check for all areas */
for(ar= sa->regionbase.first; ar; ar= ar->next)
if(ar->regiontype == RGN_TYPE_WINDOW)
break;
if(ar)
WM_event_add_keymap_handler_bb(handlers, keymap, &rect, &ar->winrct);
}
else
WM_event_add_keymap_handler(handlers, keymap);
}
if(flag & ED_KEYMAP_ANIMATION) {
/* frame changing and timeline operators (for time spaces) */
@ -914,7 +926,7 @@ void ED_area_initialize(wmWindowManager *wm, wmWindow *win, ScrArea *sa)
region_rect_recursive(sa, sa->regionbase.first, &rect, 0);
/* default area handlers */
ed_default_handlers(wm, &sa->handlers, sa->type->keymapflag);
ed_default_handlers(wm, sa, &sa->handlers, sa->type->keymapflag);
/* checks spacedata, adds own handlers */
if(sa->type->init)
sa->type->init(wm, sa);
@ -925,7 +937,7 @@ void ED_area_initialize(wmWindowManager *wm, wmWindow *win, ScrArea *sa)
if(ar->swinid) {
/* default region handlers */
ed_default_handlers(wm, &ar->handlers, ar->type->keymapflag);
ed_default_handlers(wm, sa, &ar->handlers, ar->type->keymapflag);
/* own handlers */
if(ar->type->init)
ar->type->init(wm, ar);