diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-20 11:40:05 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-20 11:40:05 +0400 |
| commit | 9f766c71b0a98801600c775dfc46faee84ddf49e (patch) | |
| tree | e8d933e20df512eb836062e0f8cf9191f32c1141 /source/blender/editors/space_sequencer/sequencer_select.c | |
| parent | 2338765726a5aa6b8870d573d685218720864583 (diff) | |
use event->mval rather then subtracting ar->winrct.x / y from event->x / y
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_select.c')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_select.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 2cae2d17a33..8440a107f31 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -298,7 +298,6 @@ void SEQUENCER_OT_select_inverse(struct wmOperatorType *ot) static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) { - ARegion *ar= CTX_wm_region(C); View2D *v2d= UI_view2d_fromcontext(C); Scene *scene= CTX_data_scene(C); Editing *ed= seq_give_editing(scene, FALSE); @@ -318,10 +317,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) marker=find_nearest_marker(SCE_MARKERS, 1); //XXX - dummy function for now - mval[0]= event->x - ar->winrct.xmin; - mval[1]= event->y - ar->winrct.ymin; - - seq= find_nearest_seq(scene, v2d, &hand, mval); + seq= find_nearest_seq(scene, v2d, &hand, event->mval); // XXX - not nice, Ctrl+RMB needs to do left_right only when not over a strip if(seq && linked_time && left_right) @@ -652,20 +648,15 @@ void SEQUENCER_OT_select_less(wmOperatorType *ot) static int sequencer_select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *event) { Scene *scene= CTX_data_scene(C); - ARegion *ar= CTX_wm_region(C); View2D *v2d= UI_view2d_fromcontext(C); short extend= RNA_boolean_get(op->ptr, "extend"); - int mval[2]; Sequence *mouse_seq; int selected, hand; - - mval[0]= event->x - ar->winrct.xmin; - mval[1]= event->y - ar->winrct.ymin; - + /* this works like UV, not mesh */ - mouse_seq= find_nearest_seq(scene, v2d, &hand, mval); + mouse_seq= find_nearest_seq(scene, v2d, &hand, event->mval); if (!mouse_seq) return OPERATOR_FINISHED; /* user error as with mesh?? */ |