diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2013-08-24 12:46:48 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2013-08-24 12:46:48 +0400 |
| commit | 2fefb0fe852e6fdbd867885961c9a1583a880cda (patch) | |
| tree | ecd7ce9bbc37af135e1795e88726b1593d77b579 /source/blender/editors/interface/view2d_ops.c | |
| parent | b97334f9921eec17527b56526c66e7e27a097525 (diff) | |
Fix [#36330] Clicking Scrolled Object Properties Tab Brings Up Wrong One
Actually, happened in any view2D... Just added a call to WM_event_add_mousemove() in view_pan_apply, so that overed/active button is refreshed in this case.
Diffstat (limited to 'source/blender/editors/interface/view2d_ops.c')
| -rw-r--r-- | source/blender/editors/interface/view2d_ops.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 929b7ae2a5d..3e9e16b285c 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -128,7 +128,7 @@ static int view_pan_init(bContext *C, wmOperator *op) } /* apply transform to view (i.e. adjust 'cur' rect) */ -static void view_pan_apply(wmOperator *op) +static void view_pan_apply(bContext *C, wmOperator *op) { v2dViewPanData *vpd = op->customdata; View2D *v2d = vpd->v2d; @@ -153,6 +153,7 @@ static void view_pan_apply(wmOperator *op) /* request updates to be done... */ ED_region_tag_redraw(vpd->ar); + WM_event_add_mousemove(C); UI_view2d_sync(vpd->sc, vpd->sa, v2d, V2D_LOCK_COPY); @@ -181,7 +182,7 @@ static int view_pan_exec(bContext *C, wmOperator *op) if (!view_pan_init(C, op)) return OPERATOR_CANCELLED; - view_pan_apply(op); + view_pan_apply(C, op); view_pan_exit(op); return OPERATOR_FINISHED; } @@ -209,7 +210,7 @@ static int view_pan_invoke(bContext *C, wmOperator *op, const wmEvent *event) RNA_int_set(op->ptr, "deltax", event->prevx - event->x); RNA_int_set(op->ptr, "deltay", event->prevy - event->y); - view_pan_apply(op); + view_pan_apply(C, op); view_pan_exit(op); return OPERATOR_FINISHED; } @@ -246,7 +247,7 @@ static int view_pan_modal(bContext *C, wmOperator *op, const wmEvent *event) vpd->lastx = event->x; vpd->lasty = event->y; - view_pan_apply(op); + view_pan_apply(C, op); break; } /* XXX - Mode switching isn't implemented. See comments in 36818. @@ -333,7 +334,7 @@ static int view_scrollright_exec(bContext *C, wmOperator *op) RNA_int_set(op->ptr, "deltay", 0); /* apply movement, then we're done */ - view_pan_apply(op); + view_pan_apply(C, op); view_pan_exit(op); return OPERATOR_FINISHED; @@ -377,7 +378,7 @@ static int view_scrollleft_exec(bContext *C, wmOperator *op) RNA_int_set(op->ptr, "deltay", 0); /* apply movement, then we're done */ - view_pan_apply(op); + view_pan_apply(C, op); view_pan_exit(op); return OPERATOR_FINISHED; @@ -425,7 +426,7 @@ static int view_scrolldown_exec(bContext *C, wmOperator *op) } /* apply movement, then we're done */ - view_pan_apply(op); + view_pan_apply(C, op); view_pan_exit(op); return OPERATOR_FINISHED; @@ -475,7 +476,7 @@ static int view_scrollup_exec(bContext *C, wmOperator *op) } /* apply movement, then we're done */ - view_pan_apply(op); + view_pan_apply(C, op); view_pan_exit(op); return OPERATOR_FINISHED; |