ardour/livetrax
13
0
Fork 0
Code

Modified version of Lincoln's patch to stop the summary causing very low track heights. Fixes #3527.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7994 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-11-10 21:56:32 +00:00
parent ba8b84eed1
commit b8da7d196c
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/editor_summary.cc
View File

@ -26,6 +26,7 @@
#include "region_view.h" #include "region_view.h"
#include "rgb_macros.h" #include "rgb_macros.h"
#include "keyboard.h" #include "keyboard.h"
#include "editor_routes.h"
using namespace std; using namespace std;
using namespace ARDOUR; using namespace ARDOUR;
@ -666,6 +667,9 @@ EditorSummary::set_editor_y (pair<double, double> const & y)
pair<double, double> yc = y; pair<double, double> yc = y;
double total_height = 0; double total_height = 0;
double scale_height = 0; double scale_height = 0;
_editor->_routes->suspend_redisplay ();
for (TrackViewList::const_iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) { for (TrackViewList::const_iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
if ((*i)->hidden()) { if ((*i)->hidden()) {
@ -702,13 +706,15 @@ EditorSummary::set_editor_y (pair<double, double> const & y)
} }
if (yc.first < 0 && yc.second > _track_height) { if (yc.first < 0 && yc.second > _track_height) {
(*i)->set_height ((*i)->effective_height() * scale); (*i)->set_height (max (TimeAxisView::preset_height (HeightSmall), (uint32_t) ((*i)->effective_height() * scale)));
} }
yc.first -= _track_height; yc.first -= _track_height;
yc.second -= _track_height; yc.second -= _track_height;
} }
_editor->_routes->resume_redisplay ();
set_editor_y (y.first); set_editor_y (y.first);
} }

6
gtk2_ardour/time_axis_view.cc
View File

@ -427,8 +427,12 @@ TimeAxisView::set_height (Height h)
} }
void void
TimeAxisView::set_height(uint32_t h) TimeAxisView::set_height (uint32_t h)
{ {
if (h < preset_height (HeightSmall)) {
h = preset_height (HeightSmall);
}
time_axis_vbox.property_height_request () = h; time_axis_vbox.property_height_request () = h;
height = h; height = h;