From 3d7487c9be7dbbe14dc44795f0d8cc2694cdbbb3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 17 Jul 2010 00:56:27 +0000 Subject: [PATCH] Tweak region view wave height. Fixes #3318. git-svn-id: svn://localhost/ardour2/branches/3.0@7436 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/audio_region_view.cc | 5 +---- gtk2_ardour/time_axis_view_item.cc | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 452c17aad3..e1aaf2a7a7 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -497,13 +497,10 @@ AudioRegionView::set_height (gdouble height) uint32_t wcnt = waves.size(); - // FIXME: ick - height -= 2; - for (uint32_t n = 0; n < wcnt; ++n) { gdouble ht; - if ((height) < NAME_HIGHLIGHT_THRESH) { + if (height < NAME_HIGHLIGHT_THRESH) { ht = ((height - 2 * wcnt) / (double) wcnt); } else { ht = (((height - 2 * wcnt) - NAME_HIGHLIGHT_SIZE) / (double) wcnt); diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 5af9819bf8..6fd4be08a5 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -749,7 +749,9 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) frame_handle_end->hide(); } - } if (pixel_width < 2.0) { + } + + if (pixel_width < 2.0) { if (show_vestigial) { vestigial_frame->show();