Skip non active and hidden tracks with prev/next track. Also prevent ensuring the...

[ardour.git] / gtk2_ardour / editor_ops.cc

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 43dd06780c4b106ff8187ebd07bf330e74063f69..b4cb4c688c69f7bffc09f221971e715e4abfacda 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -5147,17 +5147,26 @@ Editor::select_next_route()
 
        TimeAxisView* current = selection->tracks.front();
 
-       for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-               if (*i == current) {
-                       ++i;
-                       if (i != track_views.end()) {
-                               selection->set (*i);
-                       } else {
-                               selection->set (*(track_views.begin()));
+       RouteUI *rui;
+       do {
+               for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+                       if (*i == current) {
+                               ++i;
+                               if (i != track_views.end()) {
+                                       current = (*i);
+                               } else {
+                                       current = (*(track_views.begin()));
+                                       //selection->set (*(track_views.begin()));
+                               }
+                               break;
                        }
-                       break;
                }
-       }
+               rui = dynamic_cast<RouteUI *>(current);
+       } while ( current->hidden() || (rui != NULL && !rui->route()->active()));
+
+       selection->set(current);
+
+       ensure_track_visible(current);
 }
 
 void
@@ -5170,17 +5179,55 @@ Editor::select_prev_route()
 
        TimeAxisView* current = selection->tracks.front();
 
-       for (TrackViewList::reverse_iterator i = track_views.rbegin(); i != track_views.rend(); ++i) {
-               if (*i == current) {
-                       ++i;
-                       if (i != track_views.rend()) {
-                               selection->set (*i);
-                       } else {
-                               selection->set (*(track_views.rbegin()));
+       RouteUI *rui;
+       do {
+               for (TrackViewList::reverse_iterator i = track_views.rbegin(); i != track_views.rend(); ++i) {
+                       if (*i == current) {
+                               ++i;
+                               if (i != track_views.rend()) {
+                                       current = (*i);
+                               } else {
+                                       current = *(track_views.rbegin());
+                               }
+                               break;
                        }
-                       break;
                }
+               rui = dynamic_cast<RouteUI *>(current);
+       } while ( current->hidden() || (rui != NULL && !rui->route()->active()));
+
+       selection->set (current);
+
+       ensure_track_visible(current);
+}
+
+void
+Editor::ensure_track_visible(TimeAxisView *track)
+{
+       if (track->hidden())
+               return;
+
+       double current_view_min_y = vertical_adjustment.get_value();
+       double current_view_max_y = vertical_adjustment.get_value() + vertical_adjustment.get_page_size() - canvas_timebars_vsize;
+
+       double track_min_y = track->y_position;
+       double track_max_y = track->y_position + (double)track->effective_height;
+
+       if (track_min_y >= current_view_min_y &&
+            track_max_y <= current_view_max_y) {
+               return;
        }
+
+       double new_value;
+
+       if (track_min_y < current_view_min_y) {
+               // Track is above the current view
+               new_value = track_min_y;
+       } else {
+               // Track is below the current view
+               new_value = track->y_position + (double)track->effective_height + canvas_timebars_vsize - vertical_adjustment.get_page_size();
+       }
+
+       vertical_adjustment.set_value(new_value);
 }
 
 void