fix twice-used name "Editor" for action group

[ardour.git] / gtk2_ardour / time_axis_view.cc

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index e71bbe4778b5968d1cf60e4b33352e10a1faf1ba..104209d88498ac886c248b7ba78de637d4348562 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -380,7 +380,7 @@ TimeAxisView::controls_ebox_motion (GdkEventMotion* ev)
                controls_ebox.translate_coordinates (*control_parent, ev->x, ev->y, tx, ty);
                ev->y = ty - _editor.get_trackview_group_vertical_offset();
                _editor.drags()->motion_handler ((GdkEvent *) ev, false);
-               _editor.maybe_autoscroll (false, true);
+               _editor.maybe_autoscroll (false, true, false, ev->y_root < _resize_drag_start);
 
                /* now do the actual TAV resize */
                 int32_t const delta = (int32_t) floor (ev->y_root - _resize_drag_start);
@@ -1195,10 +1195,10 @@ TimeAxisView::color_handler ()
  * TimeAxisView is non-0 if this object covers y, or one of its children does.
  * If the covering object is a child axis, then the child is returned.
  * TimeAxisView is 0 otherwise.
- * Layer index is the layer number if the TimeAxisView is valid and is in stacked
- * region display mode, otherwise 0.
+ * Layer index is the layer number (possibly fractional) if the TimeAxisView is valid
+ * and is in stacked or expanded * region display mode, otherwise 0.
  */
-std::pair<TimeAxisView*, layer_t>
+std::pair<TimeAxisView*, double>
 TimeAxisView::covers_y_position (double y)
 {
        if (hidden()) {
@@ -1208,15 +1208,30 @@ TimeAxisView::covers_y_position (double y)
        if (_y_position <= y && y < (_y_position + height)) {
 
                /* work out the layer index if appropriate */
-               layer_t l = 0;
-               if (layer_display () == Stacked && view ()) {
-                       /* compute layer */
-                       l = layer_t ((_y_position + height - y) / (view()->child_height ()));
-                       /* clamp to max layers to be on the safe side; sometimes the above calculation
-                         returns a too-high value */
-                       if (l >= view()->layers ()) {
-                               l = view()->layers() - 1;
+               double l = 0;
+               switch (layer_display ()) {
+               case Overlaid:
+                       break;
+               case Stacked:
+                       if (view ()) {
+                               /* compute layer */
+                               l = layer_t ((_y_position + height - y) / (view()->child_height ()));
+                               /* clamp to max layers to be on the safe side; sometimes the above calculation
+                                  returns a too-high value */
+                               if (l >= view()->layers ()) {
+                                       l = view()->layers() - 1;
+                               }
                        }
+                       break;
+               case Expanded:
+                       if (view ()) {
+                               int const n = floor ((_y_position + height - y) / (view()->child_height ()));
+                               l = n * 0.5 - 0.5;
+                               if (l >= (view()->layers() - 0.5)) {
+                                       l = view()->layers() - 0.5;
+                               }
+                       }
+                       break;
                }
 
                return std::make_pair (this, l);
@@ -1297,7 +1312,7 @@ TimeAxisView::reset_visual_state ()
        /* this method is not required to trigger a global redraw */
 
        string str = gui_property ("height");
-
+       
        if (!str.empty()) {
                set_height (atoi (str));
        } else {