From f535b0f4913a9c0b31ca3b21bd717c367676ebfc Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 11 Jul 2006 15:45:19 +0000 Subject: make waveforms centered when height hits NAME_HIGHLIGHT_THRESHOLD git-svn-id: svn://localhost/ardour2/trunk@678 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/regionview.cc | 2 +- gtk2_ardour/time_axis_view.cc | 2 ++ gtk2_ardour/time_axis_view_item.cc | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/regionview.cc b/gtk2_ardour/regionview.cc index 114aaf5da3..fa51dd455c 100644 --- 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 b5ab5baa10..1f0b638037 100644 --- 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 abab306a84..a0ceb27293 100644 --- 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; } -- cgit v1.2.3