diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-05-02 20:02:48 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-05-02 20:02:48 +0000 |
| commit | 20157d04f8a5f8f7e24bd450f3a2961b4e251570 (patch) | |
| tree | 547ba49d95bb6bea07239c60ccfe849ef406b872 /gtk2_ardour/crossfade_view.cc | |
| parent | 88707bf3bbb9b2ac39fc1c5521a4c2ed9dc6eba4 (diff) | |
many changes related to region zooming; proto-visual state undo/redo stack; fill-tracks command steals "f" (follow-playhead now on shift-f
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3306 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/crossfade_view.cc')
| -rw-r--r-- | gtk2_ardour/crossfade_view.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc index 4787837617..0d1d9427d6 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_height (get_time_axis_view().height); + set_height (get_time_axis_view().current_height()); /* no frame around the xfade or overlap rects */ @@ -109,11 +109,11 @@ CrossfadeView::reset_width_dependent_items (double pixel_width) void CrossfadeView::set_height (double height) { - if (height == TimeAxisView::hSmaller || - height == TimeAxisView::hSmall) - TimeAxisViewItem::set_height (height - 3 ); - else + if (height <= TimeAxisView::hSmaller) { + TimeAxisViewItem::set_height (height - 3); + } else { TimeAxisViewItem::set_height (height - NAME_HIGHLIGHT_SIZE - 3 ); + } redraw_curves (); } @@ -160,7 +160,7 @@ CrossfadeView::redraw_curves () At "height - 3.0" the bottom of the crossfade touches the name highlight or the bottom of the track (if the track is either Small or Smaller. */ - double tav_height = get_time_axis_view().height; + double tav_height = get_time_axis_view().current_height(); if (tav_height == TimeAxisView::hSmaller || tav_height == TimeAxisView::hSmall) { h = tav_height - 3.0; |