Y_OFFSET is measured from the top of the time axis view item.
*/
- if (Config->get_show_name_highlight()) {
+ if (ARDOUR_UI::config()->get_show_name_highlight()) {
NAME_Y_OFFSET = height + 1;
NAME_HIGHLIGHT_SIZE = height + 2;
} else {
group->Event.connect (sigc::mem_fun (*this, &TimeAxisViewItem::canvas_group_event));
fill_color = base_color;
+ fill_color_name = "time axis view item base";
samples_per_pixel = fpp;
frame_position = start;
item_duration = duration;
last_item_width = 0;
wide_enough_for_name = wide;
high_enough_for_name = high;
- rect_visible = true;
vestigial_frame = 0;
if (duration == 0) {
}
if (visibility & ShowFrame) {
- frame = new ArdourCanvas::TimeRectangle (group,
+ frame = new ArdourCanvas::Rectangle (group,
ArdourCanvas::Rect (0.0, 0.0,
trackview.editor().sample_to_pixel(duration),
trackview.current_height()));
}
}
- if (Config->get_show_name_highlight() && (visibility & ShowNameHighlight)) {
+ if (ARDOUR_UI::config()->get_show_name_highlight() && (visibility & ShowNameHighlight)) {
- double width;
- double start = 1.0;
-
- if (visibility & FullWidthNameHighlight) {
- width = trackview.editor().sample_to_pixel(item_duration);
- } else {
- width = trackview.editor().sample_to_pixel(item_duration) - 2.0;
- }
-
- name_highlight = new ArdourCanvas::Rectangle (group,
- ArdourCanvas::Rect (start,
- trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE,
- width - 2.0,
- trackview.current_height() - 1.0));
+ /* rectangle size will be set in ::manage_name_highlight() */
+ name_highlight = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (name_highlight, string_compose ("name highlight for %1", get_item_name()));
name_highlight->set_data ("timeaxisviewitem", this);
name_highlight->set_outline_what (ArdourCanvas::Rectangle::TOP);
- name_highlight->set_outline_color (RGBA_TO_UINT (0,0,0,255));
+ name_highlight->set_outline_color (RGBA_TO_UINT (0,0,0,255)); // this should use a theme color
} else {
name_highlight = 0;
if (visibility & ShowNameText) {
name_text = new ArdourCanvas::Text (group);
CANVAS_DEBUG_NAME (name_text, string_compose ("name text for %1", get_item_name()));
- if (Config->get_show_name_highlight()) {
+ if (ARDOUR_UI::config()->get_show_name_highlight()) {
name_text->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, trackview.current_height() - NAME_Y_OFFSET));
} else {
name_text->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, NAME_Y_OFFSET));
return false;
}
-void
-TimeAxisViewItem::hide_rect ()
-{
- rect_visible = false;
- set_frame_color ();
-
- if (name_highlight) {
- name_highlight->set_outline_what (ArdourCanvas::Rectangle::What (0));
- name_highlight->set_fill_color (UINT_RGBA_CHANGE_A (fill_color, 64));
- }
-}
-
-void
-TimeAxisViewItem::show_rect ()
-{
- rect_visible = true;
- set_frame_color ();
-
- if (name_highlight) {
- name_highlight->set_outline_what (ArdourCanvas::Rectangle::TOP);
- name_highlight->set_fill_color (fill_color);
- }
-}
-
/**
* Set the position of this item on the timeline.
*
}
group->set_x_position (new_unit_pos);
-
PositionChanged (frame_position, src); /* EMIT_SIGNAL */
return true;
item_duration = dur;
- reset_width_dependent_items (trackview.editor().sample_to_pixel (dur));
+ double end_pixel = trackview.editor().sample_to_pixel (frame_position + dur);
+ double first_pixel = trackview.editor().sample_to_pixel (frame_position);
+
+ reset_width_dependent_items (end_pixel - first_pixel);
DurationChanged (dur, src); /* EMIT_SIGNAL */
return true;
if (_selected && frame) {
if (!selection_frame) {
- selection_frame = new ArdourCanvas::TimeRectangle (group);
+ selection_frame = new ArdourCanvas::Rectangle (group);
selection_frame->set_fill (false);
selection_frame->set_outline_color (ARDOUR_UI::config()->color ("selected time axis frame"));
selection_frame->set_ignore_events (true);
name_text_width = pixel_width (new_name, NAME_FONT) + 2;
name_text->set (new_name);
+ manage_name_text ();
}
manage_name_highlight ();
if (visibility & ShowNameText) {
- if (Config->get_show_name_highlight()) {
+ if (ARDOUR_UI::config()->get_show_name_highlight()) {
name_text->set_y_position (height - NAME_Y_OFFSET);
} else {
name_text->set_y_position (NAME_Y_OFFSET);
if (frame) {
- frame->set_y0 (1.0);
+ frame->set_y0 (0.0);
frame->set_y1 (height);
if (frame_handle_start) {
}
if (vestigial_frame) {
- vestigial_frame->set_y0 (1.0);
+ vestigial_frame->set_y0 (0.0);
vestigial_frame->set_y1 (height);
}
if (name_highlight && wide_enough_for_name && high_enough_for_name) {
name_highlight->show();
- name_highlight->set (ArdourCanvas::Rect (1.0, (double) _height - NAME_HIGHLIGHT_SIZE, _width, (double) _height - 1.0));
+ // name_highlight->set_x_position (1.0);
+ name_highlight->set (ArdourCanvas::Rect (0.0, (double) _height - NAME_HIGHLIGHT_SIZE, _width - 2.0, _height));
} else {
name_highlight->hide();
uint32_t f;
- if (Config->get_show_name_highlight()) {
+ if (ARDOUR_UI::config()->get_show_name_highlight()) {
/* name text will always be on top of name highlight, which
will always use our fill color.
*/
name_text->set_color (ArdourCanvas::contrasting_text_color (f));
}
-uint32_t
-TimeAxisViewItem::fill_opacity () const
-{
- if (!rect_visible) {
- /* if the frame/rect is marked as "invisible", then the
- fill should be translucent.parent.
- */
- return 64;
- }
-
- if (_dragging) {
- return 130;
- }
-
- uint32_t col = ARDOUR_UI::config()->color ("region base");
- return UINT_RGBA_A (col);
-}
-
-uint32_t
+ArdourCanvas::Color
TimeAxisViewItem::get_fill_color () const
{
- uint32_t f;
- uint32_t o;
-
- o = fill_opacity ();
+ const std::string mod_name = (_dragging ? "dragging region" : fill_color_name);
if (_selected) {
-
- f = ARDOUR_UI::config()->color ("selected region base");
-
- if (o == 0) {
- /* some condition of this item has set fill opacity to
- * zero, but it has been selected, so use a mid-way
- * alpha value to make it reasonably visible.
- */
- o = 130;
- }
-
- } else {
-
- if (_recregion) {
- f = ARDOUR_UI::config()->color ("recording rect");
- } else {
- if ((!Config->get_show_name_highlight() || high_enough_for_name) && !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
- f = ARDOUR_UI::config()->color ("region base");
- } else {
- f = fill_color;
- }
- }
+ return ARDOUR_UI::config()->color_mod ("selected region base", mod_name);
+ } else if (_recregion) {
+ return ARDOUR_UI::config()->color ("recording rect");
+ } else if ((!ARDOUR_UI::config()->get_show_name_highlight() || high_enough_for_name) &&
+ !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
+ return ARDOUR_UI::config()->color_mod (fill_color_name, mod_name);
}
-
- return UINT_RGBA_CHANGE_A (f, o);
+ return ARDOUR_UI::config()->color_mod (fill_color, mod_name);
}
/**
set_frame_gradient ();
if (!_recregion) {
- uint32_t f = ARDOUR_UI::config()->color ("time axis frame");
-
- if (!rect_visible) {
- /* make the frame outline be visible but rather transparent */
- f = UINT_RGBA_CHANGE_A (f, 64);
- }
-
- frame->set_outline_color (f);
+ frame->set_outline_color (ARDOUR_UI::config()->color ("time axis frame"));
}
}
item->set_fill (false);
break;
case GDK_ENTER_NOTIFY:
- if (trackview.editor().effective_mouse_mode() == Editing::MouseObject &&
- !trackview.editor().internal_editing()) {
- /* never set this to be visible in internal
- edit mode. Note, however, that we do need to
- undo visibility (LEAVE_NOTIFY case above) no
- matter what the mode is.
- */
+ if (trackview.editor().effective_mouse_mode() == Editing::MouseObject) {
+ /* Never set this to be visible in other modes. Note, however,
+ that we do need to undo visibility (LEAVE_NOTIFY case above) no
+ matter what the mode is. */
item->set_fill (true);
}
break;
{
samples_per_pixel = fpp;
set_position (this->get_position(), this);
- reset_width_dependent_items ((double) get_duration() / samples_per_pixel);
+
+ double end_pixel = trackview.editor().sample_to_pixel (frame_position + get_duration());
+ double first_pixel = trackview.editor().sample_to_pixel (frame_position);
+
+ reset_width_dependent_items (end_pixel - first_pixel);
}
void
if (show_vestigial) {
if (!vestigial_frame) {
- vestigial_frame = new ArdourCanvas::TimeRectangle (group, ArdourCanvas::Rect (0.0, 0.0, 2.0, trackview.current_height()));
+ vestigial_frame = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, 0.0, 2.0, trackview.current_height()));
CANVAS_DEBUG_NAME (vestigial_frame, string_compose ("vestigial frame for %1", get_item_name()));
vestigial_frame->set_outline_color (ARDOUR_UI::config()->color ("vestigial frame"));
vestigial_frame->set_fill_color (ARDOUR_UI::config()->color ("vestigial frame"));
if (frame) {
frame->show();
+ /* Note: x0 is always zero - the position is defined by
+ * the position of the group, not the frame.
+ */
frame->set_x1 (pixel_width);
if (selection_frame) {
projects / ardour.git / blobdiff