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

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index d874aba2ef6a4d936219602a4ad99ef55221d91a..034619c9321441c4e4fbde9f37db8660571e30bd 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -505,8 +505,6 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
        Selection::Operation op = ArdourKeyboard::selection_type (event->button.state);
        bool press = (event->type == GDK_BUTTON_PRESS);
 
-       // begin_reversible_command (_("select on click"));
-
        switch (item_type) {
        case RegionItem:
                if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
@@ -1501,9 +1499,11 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 
                default:
                        break;
-
+                        
                }
 
+                /* do any (de)selection operations that should occur on button release */
+                button_selection (item, event, item_type);
                return true;
                break;
 
@@ -1548,6 +1548,9 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
        default:
                break;
        }
+
+        cerr << "button release hits bottom\n";
+
        return false;
 }
 

diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index be7daf4ce42e424101c966eb983a8b1451fe671d..72c115738c0c056ceb176c987687f5b76b0246fc 100644 (file)
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -522,7 +522,6 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 
                switch (op) {
                case Selection::Toggle:
-
                        if (selection->selected (clicked_regionview)) {
                                if (press) {
 
@@ -533,11 +532,10 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
                                        button_release_can_deselect = true;
 
                                } else {
-
                                        if (button_release_can_deselect) {
 
                                                /* just remove this one region, but only on a permitted button release */
-
+                                                
                                                selection->remove (clicked_regionview);
                                                commit = true;