X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view_item.cc;h=23c17476d3470881620e3838c523bf8a10afe859;hb=d1f45e9b3d6a7e272e5563cc50175dfb6d904361;hp=01d77cf78ae82ffc6604cceca4adfc9e39bcd29f;hpb=4258a349121392516543486bd9de6f13fe3f3331;p=ardour.git diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 01d77cf78a..23c17476d3 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -17,6 +17,8 @@ */ +#include + #include "pbd/error.h" #include "pbd/stacktrace.h" @@ -29,7 +31,8 @@ #include "canvas/group.h" #include "canvas/rectangle.h" #include "canvas/debug.h" -#include "canvas/pixbuf.h" +#include "canvas/text.h" +#include "canvas/utils.h" #include "ardour_ui.h" /* @@ -80,7 +83,7 @@ TimeAxisViewItem::set_constant_heights () Gtkmm2ext::get_ink_pixel_size (layout, width, height); NAME_HEIGHT = height; - NAME_Y_OFFSET = height + 3; + NAME_Y_OFFSET = height + 5; // XXX this offset is magic NAME_HIGHLIGHT_SIZE = height + 2; NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 3; } @@ -108,10 +111,7 @@ TimeAxisViewItem::TimeAxisViewItem( , _automation (automation) , _dragging (false) { - group = new ArdourCanvas::Group (&parent); - CANVAS_DEBUG_NAME (group, string_compose ("TAVI group for %1", it_name)); - - init (it_name, spu, base_color, start, duration, vis, true, true); + init (it_name, &parent, spu, base_color, start, duration, vis, true, true); } TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other) @@ -133,20 +133,24 @@ TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other) /* share the other's parent, but still create a new group */ ArdourCanvas::Group* parent = other.group->parent(); - - group = new ArdourCanvas::Group (parent); - + _selected = other._selected; - - init (other.item_name, other.frames_per_pixel, c, other.frame_position, + + init (other.item_name, parent, other.samples_per_pixel, c, other.frame_position, other.item_duration, other.visibility, other.wide_enough_for_name, other.high_enough_for_name); } void -TimeAxisViewItem::init (const string& it_name, double fpp, Gdk::Color const & base_color, framepos_t start, framepos_t duration, Visibility vis, bool wide, bool high) +TimeAxisViewItem::init (const string& it_name, ArdourCanvas::Group* parent, double fpp, Gdk::Color const & base_color, + framepos_t start, framepos_t duration, Visibility vis, + bool wide, bool high) { + group = new ArdourCanvas::Group (parent); + CANVAS_DEBUG_NAME (group, string_compose ("TAVI group for %1", get_item_name())); + group->Event.connect (sigc::mem_fun (*this, &TimeAxisViewItem::canvas_group_event)); + item_name = it_name; - frames_per_pixel = fpp; + samples_per_pixel = fpp; frame_position = start; item_duration = duration; name_connected = false; @@ -157,7 +161,7 @@ TimeAxisViewItem::init (const string& it_name, double fpp, Gdk::Color const & ba show_vestigial = true; visibility = vis; _sensitive = true; - name_pixbuf_width = 0; + name_text_width = 0; last_item_width = 0; wide_enough_for_name = wide; high_enough_for_name = high; @@ -168,29 +172,26 @@ TimeAxisViewItem::init (const string& it_name, double fpp, Gdk::Color const & ba } vestigial_frame = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, 1.0, 2.0, trackview.current_height())); + CANVAS_DEBUG_NAME (vestigial_frame, string_compose ("vestigial frame for %1", get_item_name())); vestigial_frame->hide (); - vestigial_frame->set_outline_what (0xF); - vestigial_frame->set_outline_color (ARDOUR_UI::config()->canvasvar_VestigialFrame.get()); - vestigial_frame->set_fill_color (ARDOUR_UI::config()->canvasvar_VestigialFrame.get()); + vestigial_frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_VestigialFrame()); + vestigial_frame->set_fill_color (ARDOUR_UI::config()->get_canvasvar_VestigialFrame()); if (visibility & ShowFrame) { frame = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, 1.0, trackview.editor().sample_to_pixel(duration), trackview.current_height())); - - frame->set_outline_width (1); - frame->set_outline_what (0xF); + CANVAS_DEBUG_NAME (frame, string_compose ("frame for %1", get_item_name())); if (_recregion) { - frame->set_outline_color (ARDOUR_UI::config()->canvasvar_RecordingRect.get()); + frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RecordingRect()); } else { - frame->set_outline_color (ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get()); + frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame()); } - frame->set_outline_what (0x1|0x2|0x4|0x8); - } else { + frame = 0; } @@ -199,15 +200,19 @@ TimeAxisViewItem::init (const string& it_name, double fpp, Gdk::Color const & ba if (visibility & FullWidthNameHighlight) { name_highlight = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, trackview.editor().sample_to_pixel(item_duration), - trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, trackview.current_height())); + trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, + trackview.current_height())); + CANVAS_DEBUG_NAME (name_highlight, string_compose ("name highlight for %1", get_item_name())); } else { name_highlight = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (1.0, trackview.editor().sample_to_pixel(item_duration) - 1, - trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, trackview.current_height())); + trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, + trackview.current_height())); + 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 (0x4); + name_highlight->set_outline_what (ArdourCanvas::Rectangle::TOP); /* we should really use a canvas color property here */ name_highlight->set_outline_color (RGBA_TO_UINT (0,0,0,255)); @@ -216,11 +221,13 @@ TimeAxisViewItem::init (const string& it_name, double fpp, Gdk::Color const & ba } if (visibility & ShowNameText) { - name_pixbuf = new ArdourCanvas::Pixbuf(group); - name_pixbuf->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, trackview.current_height() + 1 - NAME_Y_OFFSET)); - + name_text = new ArdourCanvas::Text (group); + CANVAS_DEBUG_NAME (name_text, string_compose ("name text for %1", get_item_name())); + name_text->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, trackview.current_height() - NAME_Y_OFFSET)); + name_text->set_font_description (NAME_FONT); + } else { - name_pixbuf = 0; + name_text = 0; } /* create our grab handles used for trimming/duration etc */ @@ -229,9 +236,16 @@ TimeAxisViewItem::init (const string& it_name, double fpp, Gdk::Color const & ba double width = TimeAxisViewItem::GRAB_HANDLE_WIDTH; frame_handle_start = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height())); - frame_handle_start->set_outline_what (0x0); + CANVAS_DEBUG_NAME (frame_handle_start, "TAVI frame handle start"); + frame_handle_start->set_outline (false); + frame_handle_start->set_fill (false); + frame_handle_start->Event.connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisViewItem::frame_handle_crossing), frame_handle_start)); + frame_handle_end = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height())); - frame_handle_end->set_outline_what (0x0); + CANVAS_DEBUG_NAME (frame_handle_end, "TAVI frame handle end"); + frame_handle_end->set_outline (false); + frame_handle_end->set_fill (false); + frame_handle_end->Event.connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisViewItem::frame_handle_crossing), frame_handle_end)); } else { frame_handle_start = frame_handle_end = 0; } @@ -242,6 +256,7 @@ TimeAxisViewItem::init (const string& it_name, double fpp, Gdk::Color const & ba set_position (start, this); Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&TimeAxisViewItem::parameter_changed, this, _1), gui_context ()); + ARDOUR_UI::config()->ParameterChanged.connect (sigc::mem_fun (*this, &TimeAxisViewItem::parameter_changed)); } TimeAxisViewItem::~TimeAxisViewItem() @@ -249,6 +264,12 @@ TimeAxisViewItem::~TimeAxisViewItem() delete group; } +bool +TimeAxisViewItem::canvas_group_event (GdkEvent* /*ev*/) +{ + return false; +} + void TimeAxisViewItem::hide_rect () { @@ -256,7 +277,7 @@ TimeAxisViewItem::hide_rect () set_frame_color (); if (name_highlight) { - name_highlight->set_outline_what (0); + name_highlight->set_outline_what (ArdourCanvas::Rectangle::What (0)); name_highlight->set_fill_color (UINT_RGBA_CHANGE_A (fill_color, 64)); } } @@ -268,12 +289,11 @@ TimeAxisViewItem::show_rect () set_frame_color (); if (name_highlight) { - name_highlight->set_outline_what (0x4); + name_highlight->set_outline_what (ArdourCanvas::Rectangle::TOP); name_highlight->set_fill_color (fill_color); } } - /** * Set the position of this item on the timeline. * @@ -301,7 +321,7 @@ TimeAxisViewItem::set_position(framepos_t pos, void* src, double* delta) */ double old_unit_pos; - double new_unit_pos = pos / frames_per_pixel; + double new_unit_pos = pos / samples_per_pixel; old_unit_pos = group->position().x; @@ -519,15 +539,15 @@ TimeAxisViewItem::get_time_axis_view () const void TimeAxisViewItem::set_name_text(const string& new_name) { - if (!name_pixbuf) { + if (!name_text) { return; } last_item_width = trackview.editor().sample_to_pixel(item_duration); - name_pixbuf_width = pixel_width (new_name, NAME_FONT) + 2; - name_pixbuf->set (pixbuf_from_string(new_name, NAME_FONT, name_pixbuf_width, NAME_HEIGHT, Gdk::Color ("#000000"))); -} + name_text_width = pixel_width (new_name, NAME_FONT) + 2; + name_text->set (new_name); +} /** * Set the height of this item. @@ -561,7 +581,7 @@ TimeAxisViewItem::set_height (double height) } if (visibility & ShowNameText) { - name_pixbuf->set_y_position (height + 1 - NAME_Y_OFFSET); + name_text->set_y_position (height + 1 - NAME_Y_OFFSET); } if (frame) { @@ -574,7 +594,7 @@ TimeAxisViewItem::set_height (double height) vestigial_frame->set_y1 (height - 1); - update_name_pixbuf_visibility (); + update_name_text_visibility (); set_colors (); } @@ -603,12 +623,6 @@ TimeAxisViewItem::get_name_highlight() return name_highlight; } -ArdourCanvas::Pixbuf* -TimeAxisViewItem::get_name_pixbuf() -{ - return name_pixbuf; -} - /** * Calculate some contrasting color for displaying various parts of this item, based upon the base color. * @@ -714,62 +728,120 @@ TimeAxisViewItem::set_colors() if (name_highlight) { name_highlight->set_fill_color (fill_color); } + + if (name_text) { + double r, g, b, a; + + const double black_r = 0.0; + const double black_g = 0.0; + const double black_b = 0.0; + + const double white_r = 1.0; + const double white_g = 1.0; + const double white_b = 1.0; + + ArdourCanvas::color_to_rgba (fill_color, r, g, b, a); + + /* Use W3C contrast guideline calculation */ + + double white_contrast = (max (r, white_r) - min (r, white_r)) + + (max (g, white_g) - min (g, white_g)) + + (max (b, white_b) - min (b, white_b)); + + double black_contrast = (max (r, black_r) - min (r, black_r)) + + (max (g, black_g) - min (g, black_g)) + + (max (b, black_b) - min (b, black_b)); + + if (white_contrast > black_contrast) { + /* use white */ + name_text->set_color (ArdourCanvas::rgba_to_color (1.0, 1.0, 1.0, 1.0)); + } else { + /* use black */ + name_text->set_color (ArdourCanvas::rgba_to_color (0.0, 0.0, 0.0, 1.0)); + } + +#if 0 + double h, s, v; + + ArdourCanvas::color_to_hsv (fill_color, h, s, v); + + if (v == 0.0) { + /* fill is black, set text to white */ + name_text->set_color (ArdourCanvas::rgba_to_color (1.0, 1.0, 1.0, 1.0)); + } else if (v == 1.0) { + /* fill is white, set text to black */ + name_text->set_color (ArdourCanvas::rgba_to_color (0.0, 0.0, 0.0, 1.0)); + } else { + + h = fabs (fmod ((h - 180), 360.0)); /* complementary color */ + s = 1.0; /* fully saturate */ + v = 0.9; /* increase lightness/brightness/value */ + + name_text->set_color (ArdourCanvas::hsv_to_color (h, s, v, 1.0)); + } +#endif + + } + set_trim_handle_colors(); } -/** - * Sets the frame color depending on whether this item is selected - */ -void -TimeAxisViewItem::set_frame_color() +uint32_t +TimeAxisViewItem::get_fill_color () const { uint32_t f = 0; - if (!frame) { - return; - } - if (_selected) { - f = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(); - - if (fill_opacity) { - f = UINT_RGBA_CHANGE_A (f, fill_opacity); - } - - if (!rect_visible) { - f = UINT_RGBA_CHANGE_A (f, 0); - } + f = ARDOUR_UI::config()->get_canvasvar_SelectedFrameBase(); } else { if (_recregion) { - f = ARDOUR_UI::config()->canvasvar_RecordingRect.get(); + f = ARDOUR_UI::config()->get_canvasvar_RecordingRect(); } else { - if (high_enough_for_name && !Config->get_color_regions_using_track_color()) { - f = ARDOUR_UI::config()->canvasvar_FrameBase.get(); + if (high_enough_for_name && !ARDOUR_UI::config()->get_color_regions_using_track_color()) { + f = ARDOUR_UI::config()->get_canvasvar_FrameBase(); } else { f = fill_color; } + } + } - if (fill_opacity) { - f = UINT_RGBA_CHANGE_A (f, fill_opacity); - } + return f; +} - if (!rect_visible) { - f = UINT_RGBA_CHANGE_A (f, 0); - } - } +/** + * Sets the frame color depending on whether this item is selected + */ +void +TimeAxisViewItem::set_frame_color() +{ + uint32_t f = 0; + + if (!frame) { + return; + } + + f = get_fill_color (); + + if (fill_opacity) { + f = UINT_RGBA_CHANGE_A (f, fill_opacity); + } + + if (!rect_visible) { + f = UINT_RGBA_CHANGE_A (f, 0); } frame->set_fill_color (f); + set_frame_gradient (); if (!_recregion) { if (_selected) { - f = ARDOUR_UI::config()->canvasvar_SelectedTimeAxisFrame.get(); + f = ARDOUR_UI::config()->get_canvasvar_SelectedTimeAxisFrame(); } else { - f = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get(); + f = ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame(); } if (!rect_visible) { @@ -780,6 +852,36 @@ TimeAxisViewItem::set_frame_color() } } +void +TimeAxisViewItem::set_frame_gradient () +{ + if (ARDOUR_UI::config()->get_timeline_item_gradient_depth() == 0.0) { + frame->set_gradient (ArdourCanvas::Fill::StopList (), 0); + return; + } + + ArdourCanvas::Fill::StopList stops; + double r, g, b, a; + double h, s, v; + ArdourCanvas::Color f (get_fill_color()); + + /* need to get alpha value */ + ArdourCanvas::color_to_rgba (f, r, g, b, a); + + stops.push_back (std::make_pair (0.0, f)); + + /* now a darker version */ + + ArdourCanvas::color_to_hsv (f, h, s, v); + + v = min (1.0, v * (1.0 - ARDOUR_UI::config()->get_timeline_item_gradient_depth())); + + ArdourCanvas::Color darker = ArdourCanvas::hsv_to_color (h, s, v, a); + stops.push_back (std::make_pair (1.0, darker)); + + frame->set_gradient (stops, true); +} + /** * Set the colors of the start and end trim handle depending on object state */ @@ -788,20 +890,36 @@ TimeAxisViewItem::set_trim_handle_colors() { if (frame_handle_start) { if (position_locked) { - frame_handle_start->set_fill_color (ARDOUR_UI::config()->canvasvar_TrimHandleLocked.get()); - frame_handle_end->set_fill_color (ARDOUR_UI::config()->canvasvar_TrimHandleLocked.get()); + frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandleLocked()); + frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandleLocked()); } else { - frame_handle_start->set_fill_color (RGBA_TO_UINT (1, 1, 1, 0)); //ARDOUR_UI::config()->canvasvar_TrimHandle.get(); - frame_handle_end->set_fill_color (RGBA_TO_UINT (1, 1, 1, 0)); //ARDOUR_UI::config()->canvasvar_TrimHandle.get(); + frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandle()); + frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandle()); } } } +bool +TimeAxisViewItem::frame_handle_crossing (GdkEvent* ev, ArdourCanvas::Rectangle* item) +{ + switch (ev->type) { + case GDK_LEAVE_NOTIFY: + item->set_fill (false); + break; + case GDK_ENTER_NOTIFY: + item->set_fill (true); + break; + default: + break; + } + return false; +} + /** @return the frames per pixel */ double -TimeAxisViewItem::get_frames_per_pixel () const +TimeAxisViewItem::get_samples_per_pixel () const { - return frames_per_pixel; + return samples_per_pixel; } /** Set the frames per pixel of this item. @@ -811,17 +929,16 @@ TimeAxisViewItem::get_frames_per_pixel () const * @param fpp the new frames per pixel */ void -TimeAxisViewItem::set_frames_per_pixel (double fpp) +TimeAxisViewItem::set_samples_per_pixel (double fpp) { - frames_per_pixel = fpp; + samples_per_pixel = fpp; set_position (this->get_position(), this); - reset_width_dependent_items ((double) get_duration() / frames_per_pixel); + reset_width_dependent_items ((double) get_duration() / samples_per_pixel); } void TimeAxisViewItem::reset_width_dependent_items (double pixel_width) { - if (pixel_width < 2.0) { if (show_vestigial) { @@ -874,6 +991,7 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) * the right-hand end of frame_handle_start and the left-hand * end of frame_handle_end, so disable the handles */ + frame_handle_start->hide(); frame_handle_end->hide(); } else { @@ -887,7 +1005,7 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) wide_enough_for_name = true; } - update_name_pixbuf_visibility (); + update_name_text_visibility (); } void @@ -895,19 +1013,19 @@ TimeAxisViewItem::reset_name_width (double /*pixel_width*/) { uint32_t it_width; int pb_width; - bool pixbuf_holds_full_name; + bool showing_full_name; - if (!name_pixbuf) { + if (!name_text) { return; } it_width = trackview.editor().sample_to_pixel(item_duration); - pb_width = name_pixbuf_width; + pb_width = name_text_width; - pixbuf_holds_full_name = last_item_width > pb_width + NAME_X_OFFSET; + showing_full_name = last_item_width > pb_width + NAME_X_OFFSET; last_item_width = it_width; - if (pixbuf_holds_full_name && (it_width >= pb_width + NAME_X_OFFSET)) { + if (showing_full_name && (it_width >= pb_width + NAME_X_OFFSET)) { /* we've previously had the full name length showing and its still showing. @@ -925,13 +1043,14 @@ TimeAxisViewItem::reset_name_width (double /*pixel_width*/) wide_enough_for_name = true; } - update_name_pixbuf_visibility (); + update_name_text_visibility (); if (pb_width < 1) { pb_width = 1; } - name_pixbuf->set (pixbuf_from_string(item_name, NAME_FONT, pb_width, NAME_HEIGHT, Gdk::Color ("#000000"))); + name_text->set (item_name); + name_text->clamp_width (pb_width); } /** @@ -958,16 +1077,16 @@ TimeAxisViewItem::set_y (double y) } void -TimeAxisViewItem::update_name_pixbuf_visibility () +TimeAxisViewItem::update_name_text_visibility () { - if (!name_pixbuf) { + if (!name_text) { return; } if (wide_enough_for_name && high_enough_for_name) { - name_pixbuf->show (); + name_text->show (); } else { - name_pixbuf->hide (); + name_text->hide (); } } @@ -975,6 +1094,8 @@ void TimeAxisViewItem::parameter_changed (string p) { if (p == "color-regions-using-track-color") { - set_frame_color (); + set_colors (); + } else if (p == "timeline-item-gradient-depth") { + set_frame_gradient (); } }