make waveforms centered when height hits NAME_HIGHLIGHT_THRESHOLD

git-svn-id: svn://localhost/ardour2/trunk@678 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/regionview.cc b/gtk2_ardour/regionview.cc
index 114aaf5da37f2232d66c512c404bb47f3fddda87..fa51dd455ccc791dcf87bd9bb2c3b6869f99a529 100644 (file)
--- a/gtk2_ardour/regionview.cc
+++ b/gtk2_ardour/regionview.cc
@@ -518,7 +518,7 @@ AudioRegionView::set_height (gdouble height)
        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.cc b/gtk2_ardour/time_axis_view.cc
index b5ab5baa1098a6868cacc0ffda3ef24dc2558400..1f0b638037ed85bed772faf30d4782334aefbd67 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -948,6 +948,8 @@ TimeAxisView::compute_controls_size_info ()
 
        hSmaller = req.height + extra_height;
 
+       cerr << "hSmaller = " << hSmaller << endl;
+
        window.remove ();
        window.add (two_row_table);
 

diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index abab306a84d548044c3ea11b58c746895e42aa93..a0ceb27293fa9cc8007c7b22e01ebada0cd390af 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -93,6 +93,8 @@ TimeAxisViewItem::TimeAxisViewItem(const string & it_name, ArdourCanvas::Group&
                NAME_HIGHLIGHT_SIZE = height + 6;
                NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 2;
 
+               cerr << "name highlight threshold = " << NAME_HIGHLIGHT_THRESH << endl;
+
                have_name_font = true;
        }