Fix disappearing regionviews during rapid mouse movement plus grab/copy grab, update...

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3709 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 3332f5c8e64cd7cc6fed89baab0cef4f4a3e8986..9a05d9de0d59087ea6157d9acc98f0485c68f8ea 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -818,7 +818,6 @@ class Editor : public PublicEditor
        double canvas_width;
        double canvas_height;
        double full_canvas_height;
-       double grabbed_vadjustment;
        nframes64_t last_canvas_frame;
 
        bool track_canvas_map_handler (GdkEventAny*);

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 376b47409631690cc0f829204ea38539dfc14b39..a1fb64014b7400b0c9cfbf847ac3c1b928570fd6 100644 (file)
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -763,7 +763,7 @@ Editor::autoscroll_canvas ()
        Gdk::ModifierType mask;
        canvas_window->get_pointer (x, y, mask);
        ev.type = GDK_MOTION_NOTIFY;
-       ev.state |= Gdk::BUTTON1_MASK;
+       ev.state &= Gdk::BUTTON1_MASK;
        ev.x = x;
        ev.y = y;
 

diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index fc03aa49bdae1243b993e3b72338ada07eaa03d5..cbdac718f49b6b4551dd7688ff735c4f4893ac47 100644 (file)
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -198,10 +198,6 @@ Editor::track_canvas_motion (GdkEvent *ev)
                verbose_canvas_cursor->property_y() = clamp_verbose_cursor_y (ev->motion.y + 20);
        }
 
-#ifdef GTKOSX
-       flush_canvas ();
-#endif
-
        return false;
 }
 

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index c981584c0d252a278bae1e0726b2609c1a45a32d..2d364ac4eab27f903e93f4326b708483761f4730 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -213,10 +213,9 @@ Editor::which_grabber_cursor ()
                return grabber_edit_point_cursor;
                break;
        default:
-         //return grabber_cursor;
                break;
        }
-               return grabber_cursor;
+       return grabber_cursor;
 }
 
 void
@@ -638,8 +637,8 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
                                        
                                case RegionViewName:
                                        /* rename happens on edit clicks */
-                                               start_trim (clicked_regionview->get_name_highlight(), event);
-                                               return true;
+                                       start_trim (clicked_regionview->get_name_highlight(), event);
+                                       return true;
                                        break;
 
                                case GainAutomationControlPointItem:
@@ -2980,17 +2979,6 @@ Editor::line_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event)
 void
 Editor::start_region_grab (ArdourCanvas::Item* item, GdkEvent* event)
 {
-       /* 
-          the group containing moved regions may have been 
-          offset during autoscroll. reset its y offset
-          (we should really handle this in the same way 
-          we do with the x axis, but a simple way of achieving that 
-          eludes me right now). 
-       */
-
-       _region_motion_group->property_y() = 0;
-       grabbed_vadjustment = vertical_adjustment.get_value ();
-
        if (selection->regions.empty() || clicked_regionview == 0) {
                return;
        }
@@ -3027,14 +3015,23 @@ Editor::start_region_grab (ArdourCanvas::Item* item, GdkEvent* event)
        show_verbose_time_cursor (drag_info.last_frame_position, 10);
 
        begin_reversible_command (_("move region(s)"));
+       /* 
+          the group containing moved regions may have been 
+          offset during autoscroll. reset its y offset
+          (we should really handle this in the same way 
+          we do with the x axis, but a simple way of achieving that 
+          eludes me right now). 
+       */
+
+       _region_motion_group->property_y() = 0;
+
+       /* sync the canvas to what we think is its current state */
+       track_canvas->update_now();
 }
 
 void
 Editor::start_region_copy_grab (ArdourCanvas::Item* item, GdkEvent* event)
 {
-       _region_motion_group->property_y() = 0;
-       grabbed_vadjustment = vertical_adjustment.get_value ();
-
        if (selection->regions.empty() || clicked_regionview == 0) {
                return;
        }
@@ -3062,6 +3059,8 @@ Editor::start_region_copy_grab (ArdourCanvas::Item* item, GdkEvent* event)
        drag_info.motion_callback = &Editor::region_drag_motion_callback;
        drag_info.finished_callback = &Editor::region_drag_finished_callback;
        show_verbose_time_cursor (drag_info.last_frame_position, 10);
+
+       _region_motion_group->property_y() = 0;
 }
 
 void
@@ -3110,14 +3109,10 @@ Editor::possibly_copy_regions_during_grab (GdkEvent* event)
                vector<RegionView*> new_regionviews;
                
                for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i) {
-                       RegionView* rv;
                        RegionView* nrv;
                        AudioRegionView* arv;
                        
-                       rv = (*i);
-
-                       
-                       if ((arv = dynamic_cast<AudioRegionView*>(rv)) == 0) {
+                       if ((arv = dynamic_cast<AudioRegionView*>(*i)) == 0) {
                                /* XXX handle MIDI here */
                                continue;
                        }
@@ -3151,6 +3146,14 @@ Editor::possibly_copy_regions_during_grab (GdkEvent* event)
                drag_info.data = new_regionviews.front();
 
                swap_grab (new_regionviews.front()->get_canvas_group (), 0, event->motion.time);
+               /* 
+                  sync the canvas to what we think is its current state 
+                  without it, the canvas seems to 
+                  "forget" to update properly after the upcoming reparent() 
+                  ..only if the mouse is in rapid motion at the time of the grab. 
+                  something to do with regionview creation raking so long?
+                */
+               track_canvas->update_now();
        }
 }
 
@@ -3270,7 +3273,7 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
        }
 
        original_pointer_order = drag_info.dest_trackview->order;
-               
+       
        /************************************************************
                  Y-Delta Computation
        ************************************************************/   
@@ -3582,7 +3585,7 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
                        if (drag_info.first_move) {
 
                                // hide any dependent views 
-                       
+       
                                rv->get_time_axis_view().hide_dependent_views (*rv);
 
                                /* 
@@ -3592,9 +3595,9 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
                                   parent groups have different coordinates.
                                */
 
+                               rv->get_canvas_group()->property_y() =  iy1 - 1;
                                rv->get_canvas_group()->reparent(*_region_motion_group);
 
-                               rv->get_canvas_group()->move ( 0, iy1 - 1);
                                rv->fake_set_opaque (true);
                        }
                        /* for evaluation of the track position of iy1, we have to adjust 
@@ -3667,9 +3670,7 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
                        if (drag_info.brushing) {
                                mouse_brush_insert_region (rv, pending_region_position);
                        } else {
-
-                         rv->move (x_delta, y_delta);
-
+                               rv->move (x_delta, y_delta);
                        }
 
                } /* foreach region */
@@ -3765,11 +3766,9 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
        for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ) {
                        
                RegionView* rv = (*i);              
-               double ix1, ix2, iy1, iy2, y_pos;
+               double ix1, ix2, iy1, iy2;
                rv->get_canvas_frame()->get_bounds (ix1, iy1, ix2, iy2);
                rv->get_canvas_group()->i2w (ix1, iy1);
-
-               y_pos = iy1;
                iy1 += vertical_adjustment.get_value() - canvas_timebars_vsize;
 
                TimeAxisView* dest_tv = trackview_by_y_position (iy1);
@@ -3846,13 +3845,10 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
                           back to its original canvas group (its streamview).
                           No need to do anything for copies as they are fake regions which will be deleted.
                        */
-                       /* account for any vertical autoscrolling that might have happened during the move */
-                       double vadjustment_delta = vertical_adjustment.get_value () - grabbed_vadjustment;
-                       y_pos += vadjustment_delta;
 
                        RouteTimeAxisView* dest_rtv = dynamic_cast<RouteTimeAxisView*> (dest_atv);
                        rv->get_canvas_group()->reparent (*dest_rtv->view()->canvas_item());
-                       rv->get_canvas_group()->move ( 0, -y_pos + 1);
+                       rv->get_canvas_group()->property_y() = 0;
                  
                        /* just change the model */
                        

diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index de5810174057ae78ea0d8b92fc0670840492bac6..efedb458dcb358f19893f310f38c42313f6ab6ea 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -638,7 +638,7 @@ TimeAxisViewItem::get_canvas_frame()
 /**
  * 
  */
-ArdourCanvas::Item*
+ArdourCanvas::Group*
 TimeAxisViewItem::get_canvas_group()
 {
        return (group) ;

diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index 618fd2125b3a76aab52879a9d99825cee5d8b68f..537a50c1ce090893b0682597625af3a17ecc9f08 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -221,7 +221,7 @@ class TimeAxisViewItem : public Selectable
     /**
      * 
      */
-    ArdourCanvas::Item* get_canvas_group();
+    ArdourCanvas::Group* get_canvas_group();
 
     /**
      *