From 1ca9cd228e332440226c7256f539f6d343d2eca2 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 19 Mar 2015 21:55:28 +0100 Subject: [PATCH] update track-height scaling: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit “number of visible tracks”: count automation lanes as tracks. Distribute equally. “Summary View”: the visual lane represents both track + automation. Set the total height. Left to do: recursive “Shrink” and “Expand” tools if there is no explicit selection. --- gtk2_ardour/editor.cc | 2 +- gtk2_ardour/editor_summary.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index f20b24a80b..83190a993a 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -3769,7 +3769,7 @@ Editor::set_visible_track_count (int32_t n) } for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - (*i)->set_height (h); + (*i)->set_height (h, TimeAxisView::HeightPerLane); } if (str != visible_tracks_selector.get_text()) { diff --git a/gtk2_ardour/editor_summary.cc b/gtk2_ardour/editor_summary.cc index 1ed9af974e..b570cf4e1a 100644 --- a/gtk2_ardour/editor_summary.cc +++ b/gtk2_ardour/editor_summary.cc @@ -972,7 +972,7 @@ EditorSummary::set_editor_y (pair const y) } if (yc.first <= 0 && yc.second >= _track_height) { - (*i)->set_height (max (TimeAxisView::preset_height (HeightSmall), (uint32_t) ((*i)->effective_height() * scale))); + (*i)->set_height (max (TimeAxisView::preset_height (HeightSmall), (uint32_t) ((*i)->effective_height() * scale)), TimeAxisView::TotalHeight); } yc.first -= _track_height;