From b87ca000f86fdfc210c08056ae8e921236ea96c7 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 19 Sep 2008 19:32:10 +0000 Subject: Merge all the (disconcertingly missing) track/region/etc height changes from 2.0. Fix track y positioning and initial region size/location. Fix automation click-to-add-points (i.e. points actually show up where you click). Fancy whiz-bang dynamic resize 2.0 professional edition support for MIDI/CC/Automation tracks/regions. git-svn-id: svn://localhost/ardour2/branches/3.0@3769 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/crossfade_view.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gtk2_ardour/crossfade_view.cc') diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc index 1b5f4d886a..8507d5e4d9 100644 --- a/gtk2_ardour/crossfade_view.cc +++ b/gtk2_ardour/crossfade_view.cc @@ -69,7 +69,7 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, fade_out->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeLine.get(); fade_out->property_width_pixels() = 1; - set_y_position_and_height (0, get_time_axis_view().current_height()); + set_height (get_time_axis_view().current_height()); /* no frame around the xfade or overlap rects */ @@ -107,12 +107,12 @@ CrossfadeView::reset_width_dependent_items (double pixel_width) } void -CrossfadeView::set_y_position_and_height (double y, double h) +CrossfadeView::set_height (double height) { - if (h <= TimeAxisView::hSmaller) { - TimeAxisViewItem::set_y_position_and_height (y, h - 3); + if (height <= TimeAxisView::hSmaller) { + TimeAxisViewItem::set_height (height - 3); } else { - TimeAxisViewItem::set_y_position_and_height (y, h - NAME_HIGHLIGHT_SIZE - 3 ); + TimeAxisViewItem::set_height (height - NAME_HIGHLIGHT_SIZE - 3 ); } redraw_curves (); -- cgit v1.2.3