blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Sequencer: Drag outside of sequence to initiate box select

This commit is contained in:
Jacques Lucke 2019-05-28 17:47:26 +02:00
parent c4e4b6872a
commit 8e125f278c
Notes: blender-bot 2023-02-14 08:28:46 +01:00 
Referenced by issue #64565, Drag in empty space to box select does not work in animation editors
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/presets/keyconfig/keymap_data/blender_default.py
View File

@ -2330,6 +2330,8 @@ def km_sequencer(params):
("sequencer.select_linked_pick", {"type": 'L', "value": 'PRESS', "shift": True},
{"properties": [("extend", True)]}),
("sequencer.select_linked", {"type": 'L', "value": 'PRESS', "ctrl": True}, None),
("sequencer.select_box", {"type": params.select_tweak, "value": 'ANY'},
{"properties": [("tweak", True)]}),
("sequencer.select_box", {"type": 'B', "value": 'PRESS'}, None),
("sequencer.select_grouped", {"type": 'G', "value": 'PRESS', "shift": True}, None),
op_menu("SEQUENCER_MT_add", {"type": 'A', "value": 'PRESS', "shift": True}),

22
source/blender/editors/space_sequencer/sequencer_select.c
View File

@ -937,6 +937,22 @@ static int sequencer_box_select_exec(bContext *C, wmOperator *op)
}
/* ****** Box Select ****** */
static int sequencer_box_select_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
Scene *scene = CTX_data_scene(C);
View2D *v2d = &CTX_wm_region(C)->v2d;
const bool tweak = RNA_boolean_get(op->ptr, "tweak");
int dummy;
Sequence *seq = find_nearest_seq(scene, v2d, &dummy, event->mval);
if (tweak && seq != NULL) {
return OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH;
}
return WM_gesture_box_invoke(C, op, event);
}
void SEQUENCER_OT_select_box(wmOperatorType *ot)
{
/* identifiers */
@ -945,7 +961,7 @@ void SEQUENCER_OT_select_box(wmOperatorType *ot)
ot->description = "Select strips using box selection";
/* api callbacks */
ot->invoke = WM_gesture_box_invoke;
ot->invoke = sequencer_box_select_invoke;
ot->exec = sequencer_box_select_exec;
ot->modal = WM_gesture_box_modal;
ot->cancel = WM_gesture_box_cancel;
@ -958,6 +974,10 @@ void SEQUENCER_OT_select_box(wmOperatorType *ot)
/* properties */
WM_operator_properties_gesture_box(ot);
WM_operator_properties_select_operation_simple(ot);
PropertyRNA *prop = RNA_def_boolean(
ot->srna, "tweak", 0, "Tweak", "Operator has been activated using a tweak event");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
}
/* ****** Selected Grouped ****** */