CANVAS_DEBUG_NAME (group, "ghost region");
group->set_position (ArdourCanvas::Duple (initial_pos, 0));
- base_rect = new ArdourCanvas::Rectangle (group);
+ base_rect = new ArdourCanvas::TimeRectangle (group);
CANVAS_DEBUG_NAME (base_rect, "ghost region rect");
base_rect->set_x0 (0);
- base_rect->set_y0 (0.0);
- base_rect->set_y1 (trackview.current_height() - 1.0);
- base_rect->set_outline_what (ArdourCanvas::Rectangle::What (0));
+ base_rect->set_y0 (1.0);
+ base_rect->set_y1 (trackview.current_height());
+ base_rect->set_outline (false);
if (!is_automation_ghost()) {
base_rect->hide();
GhostRegion::set_colors ()
{
if (is_automation_ghost()) {
- base_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackBase());
- base_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackBase());
+ base_rect->set_fill_color (ARDOUR_UI::config()->color_mod ("ghost track base", "ghost track base"));
}
}
guint fill_color;
if (is_automation_ghost()) {
- fill_color = ARDOUR_UI::config()->get_canvasvar_GhostTrackWaveFill();
+ fill_color = ARDOUR_UI::config()->color ("ghost track wave fill");
}
else {
fill_color = source_track_color(200);
}
for (uint32_t n=0; n < waves.size(); ++n) {
- waves[n]->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackWave());
+ waves[n]->set_outline_color (ARDOUR_UI::config()->color ("ghost track wave"));
waves[n]->set_fill_color (fill_color);
- waves[n]->set_clip_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackWaveClip());
- waves[n]->set_zero_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackZeroLine());
+ waves[n]->set_clip_color (ARDOUR_UI::config()->color ("ghost track wave clip"));
+ waves[n]->set_zero_color (ARDOUR_UI::config()->color ("ghost track zero line"));
}
}
void
MidiGhostRegion::set_colors()
{
- guint fill = source_track_color(200);
-
GhostRegion::set_colors();
for (EventList::iterator it = events.begin(); it != events.end(); ++it) {
- (*it)->rect->set_fill_color (fill);
- (*it)->rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackMidiOutline());
+ (*it)->rect->set_fill_color (ARDOUR_UI::config()->color_mod((*it)->event->base_color(), "ghost track midi fill"));
+ (*it)->rect->set_outline_color (ARDOUR_UI::config()->color ("ghost track midi outline"));
}
}
return;
}
- double const h = trackview.current_height() / double (mv->contents_note_range ());
+ double const h = std::max(1., floor (trackview.current_height() / double (mv->contents_note_range ())) -1);
+ double const s = trackview.current_height() / double (mv->contents_note_range ());
for (EventList::iterator it = events.begin(); it != events.end(); ++it) {
uint8_t const note_num = (*it)->event->note()->note();
(*it)->rect->hide();
} else {
(*it)->rect->show();
- double const y = trackview.current_height() - (note_num + 1 - mv->lowest_note()) * h + 1;
+ double const y = trackview.current_height() - (note_num + 1 - mv->lowest_note()) * s;
(*it)->rect->set_y0 (y);
(*it)->rect->set_y1 (y + h);
}
GhostEvent* event = new GhostEvent (n, group);
events.push_back (event);
- event->rect->set_fill_color (source_track_color(200));
- event->rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackMidiOutline());
+ event->rect->set_fill_color (ARDOUR_UI::config()->color_mod(n->base_color(), "ghost track midi fill"));
+ event->rect->set_outline_color (ARDOUR_UI::config()->color ("ghost track midi outline"));
MidiStreamView* mv = midi_view();
} else {
const double y = mv->note_to_y(note_num);
event->rect->set_y0 (y);
- event->rect->set_y1 (y + mv->note_height());
+ event->rect->set_y1 (y + std::max(1., floor(mv->note_height()) -1));
}
}
}