reinstate (de)selection operations that should happen on mouse button release
git-svn-id: svn://localhost/ardour2/branches/3.0@9104 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
d2bcfc0747
commit
07e607ebad
@ -505,8 +505,6 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
|
|||||||
Selection::Operation op = ArdourKeyboard::selection_type (event->button.state);
|
Selection::Operation op = ArdourKeyboard::selection_type (event->button.state);
|
||||||
bool press = (event->type == GDK_BUTTON_PRESS);
|
bool press = (event->type == GDK_BUTTON_PRESS);
|
||||||
|
|
||||||
// begin_reversible_command (_("select on click"));
|
|
||||||
|
|
||||||
switch (item_type) {
|
switch (item_type) {
|
||||||
case RegionItem:
|
case RegionItem:
|
||||||
if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
|
if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
|
||||||
@ -1504,6 +1502,8 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* do any (de)selection operations that should occur on button release */
|
||||||
|
button_selection (item, event, item_type);
|
||||||
return true;
|
return true;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -1548,6 +1548,9 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
|
|||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cerr << "button release hits bottom\n";
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -522,7 +522,6 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
|
|||||||
|
|
||||||
switch (op) {
|
switch (op) {
|
||||||
case Selection::Toggle:
|
case Selection::Toggle:
|
||||||
|
|
||||||
if (selection->selected (clicked_regionview)) {
|
if (selection->selected (clicked_regionview)) {
|
||||||
if (press) {
|
if (press) {
|
||||||
|
|
||||||
@ -533,7 +532,6 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
|
|||||||
button_release_can_deselect = true;
|
button_release_can_deselect = true;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
if (button_release_can_deselect) {
|
if (button_release_can_deselect) {
|
||||||
|
|
||||||
/* just remove this one region, but only on a permitted button release */
|
/* just remove this one region, but only on a permitted button release */
|
||||||
|
Loading…
Reference in New Issue
Block a user