diff options
author | Carl Hetherington <carl@carlh.net> | 2010-07-25 01:17:54 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-07-25 01:17:54 +0000 |
commit | b06421c7e68aa299a5df066c86ab0494853c437c (patch) | |
tree | 09b818be473d6cb0fa5d143854c3bd1523038473 /gtk2_ardour/time_axis_view.cc | |
parent | 637bca1423c7b1402fbfc2ddf456b3eb747a9680 (diff) |
Lincoln's patch to fix #3343 (excessively small track heights on zoom out)
git-svn-id: svn://localhost/ardour2/branches/3.0@7488 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/time_axis_view.cc')
-rw-r--r-- | gtk2_ardour/time_axis_view.cc | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index de45ee07b7..741756f1b2 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -396,36 +396,19 @@ TimeAxisView::step_height (bool bigger) if ( height == preset_height(HeightSmall)){ return; } - if (height == preset_height (HeightSmaller)) { + + if (height <= preset_height (HeightSmaller) && height > preset_height (HeightSmall)) { set_height (preset_height(HeightSmall)); } - else if (height > step) { - - if ( height <= preset_height (HeightNormal) && height > preset_height (HeightSmaller)){ - set_height (preset_height(HeightSmaller)); - } - else { - set_height (height - step); - } + else if ( height <= preset_height (HeightNormal) && height > preset_height (HeightSmaller)){ + set_height (preset_height(HeightSmaller)); + } + else { + set_height (height - step); } } } -/* - switch (h) { - case HeightLargest: - return extra_height + 48 + 250; - case HeightLarger: - return extra_height + 48 + 150; - case HeightLarge: - return extra_height + 48 + 50; - case HeightNormal: - return extra_height + 48; - case HeightSmall: - return 27; - case HeightSmaller: - return smaller_height; - } -*/ + void TimeAxisView::set_heights (uint32_t h) { |