Patch from Prokoudine to fix translators list (#4580).

[ardour.git] / gtk2_ardour / editor_mouse.cc

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index e039983a67795ea8da0c9cc5596c5916d2eb2609..3d61089d9a85a44690281d82a1a141555b4dcd84 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -302,8 +302,11 @@ Editor::set_canvas_cursor ()
        }
 
        /* up-down cursor as a cue that automation can be dragged up and down when in join object/range mode */
-       if (join_object_range_button.get_active() && last_item_entered) {
-               if (last_item_entered->property_parent() && (*last_item_entered->property_parent()).get_data (X_("timeselection"))) {
+       if (join_object_range_button.get_active()) {
+               double x, y;
+               get_pointer_position (x, y);
+               ArdourCanvas::Item* i = track_canvas->get_item_at (x, y);
+               if (i && i->property_parent() && (*i->property_parent()).get_data (X_("timeselection"))) {
                        pair<TimeAxisView*, int> tvp = trackview_by_y_position (_last_motion_y + vertical_adjustment.get_value() - canvas_timebars_vsize);
                        if (dynamic_cast<AutomationTimeAxisView*> (tvp.first)) {
                                current_canvas_cursor = _cursors->up_down;
@@ -792,7 +795,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier|Keyboard::SecondaryModifier)) &&
                    event->type == GDK_BUTTON_PRESS) {
 
-                       _drags->set (new RubberbandSelectDrag (this, item), event);
+                       _drags->set (new EditorRubberbandSelectDrag (this, item), event);
 
                } else if (event->type == GDK_BUTTON_PRESS) {
 
@@ -888,7 +891,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                                        }
                                        return true;
                                } else {
-                                       _drags->set (new RubberbandSelectDrag (this, item), event);
+                                       _drags->set (new EditorRubberbandSelectDrag (this, item), event);
                                }
                                break;
 
@@ -902,7 +905,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                                        _drags->set (new RegionCreateDrag (this, item, parent), event);
                                } else {
                                        /* rubberband drag to select automation points */
-                                       _drags->set (new RubberbandSelectDrag (this, item), event);
+                                       _drags->set (new EditorRubberbandSelectDrag (this, item), event);
                                }
                                break;
                        }
@@ -1590,8 +1593,6 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
        double fraction;
         bool ret = true;
 
-       last_item_entered = item;
-
        switch (item_type) {
        case ControlPointItem:
                if (mouse_mode == MouseGain || mouse_mode == MouseObject) {