#include "audio_region_view.h"
#include "utils.h"
#include "canvas_impl.h"
+#include "ardour_ui.h"
using namespace sigc;
using namespace ARDOUR;
: TimeAxisViewItem ("xfade" /*xf.name()*/, *parent, tv, spu, basic_color, xf->position(),
- xf->length(), TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowFrame)),
+ xf->length(), false, TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowFrame)),
crossfade (xf),
left_view (lview),
right_view (rview)
_visible = true;
fade_in = new Line (*group);
- fade_in->property_fill_color_rgba() = Config->canvasvar_CrossfadeLine.get();
+ fade_in->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeLine.get();
fade_in->property_width_pixels() = 1;
fade_out = new Line (*group);
- fade_out->property_fill_color_rgba() = Config->canvasvar_CrossfadeLine.get();
+ 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().height);
+ set_height (get_time_axis_view().current_height());
/* no frame around the xfade or overlap rects */
}
void
-CrossfadeView::set_y_position_and_height (double y, double h)
+CrossfadeView::set_height (double height)
{
- if (h == TimeAxisView::hSmaller || h == TimeAxisView::hSmall) {
- 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 );
}
- _y_position = y;
- _height = h;
-
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 const tav_height = get_time_axis_view().height;
- if (tav_height == TimeAxisView::hSmaller || tav_height == TimeAxisView::hSmall) {
+
+ double tav_height = get_time_axis_view().current_height();
+ if (tav_height == TimeAxisView::hSmaller ||
+ tav_height == TimeAxisView::hSmall) {
h = tav_height - 3.0;
} else {
h = tav_height - NAME_HIGHLIGHT_SIZE - 3.0;
CrossfadeView::active_changed ()
{
if (crossfade->active()) {
- frame->property_fill_color_rgba() = Config->canvasvar_ActiveCrossfade.get();
+ frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_ActiveCrossfade.get();
} else {
- frame->property_fill_color_rgba() = Config->canvasvar_InactiveCrossfade.get();
+ frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_InactiveCrossfade.get();
}
redraw_curves ();