X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view_item.cc;h=987e5411446d9ab81d91aa4c5a34c7468c132a3c;hb=7a05dde39d2c98e1317e84c19629d6a7634799e2;hp=6b9c35bb326ed6140156858a144b812a1bb653fe;hpb=d15fda6d751a465d278f477923075d4783f3b1ca;p=ardour.git diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 6b9c35bb32..987e541144 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -35,6 +35,8 @@ #include "canvas/text.h" #include "canvas/utils.h" +#include "ardour/profile.h" + #include "ardour_ui.h" /* * ardour_ui.h was moved up in the include list @@ -59,8 +61,9 @@ using namespace Gtkmm2ext; Pango::FontDescription TimeAxisViewItem::NAME_FONT; const double TimeAxisViewItem::NAME_X_OFFSET = 15.0; -const double TimeAxisViewItem::GRAB_HANDLE_TOP = 6; -const double TimeAxisViewItem::GRAB_HANDLE_WIDTH = 5; +const double TimeAxisViewItem::GRAB_HANDLE_TOP = 0.0; +const double TimeAxisViewItem::GRAB_HANDLE_WIDTH = 10.0; +const double TimeAxisViewItem::RIGHT_EDGE_SHIFT = 1.0; int TimeAxisViewItem::NAME_HEIGHT; double TimeAxisViewItem::NAME_Y_OFFSET; @@ -86,8 +89,20 @@ TimeAxisViewItem::set_constant_heights () layout = foo.create_pango_layout (X_("H")); /* just the ascender */ NAME_HEIGHT = height; - NAME_Y_OFFSET = height + 2; - NAME_HIGHLIGHT_SIZE = height + 2; + + /* Config->get_show_name_highlight) == true: + Y_OFFSET is measured from bottom of the time axis view item. + Config->get_show_name_highlight) == false: + Y_OFFSET is measured from the top of the time axis view item. + */ + + if (Config->get_show_name_highlight()) { + NAME_Y_OFFSET = height + 1; + NAME_HIGHLIGHT_SIZE = height + 2; + } else { + NAME_Y_OFFSET = 3; + NAME_HIGHLIGHT_SIZE = 0; + } NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 3; } @@ -109,6 +124,7 @@ TimeAxisViewItem::TimeAxisViewItem( framepos_t start, framecnt_t duration, bool recording, bool automation, Visibility vis ) : trackview (tv) + , frame_position (-1) , item_name (it_name) , _height (1.0) , _recregion (recording) @@ -124,6 +140,7 @@ TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other) , Selectable (other) , PBD::ScopedConnectionList() , trackview (other.trackview) + , frame_position (-1) , item_name (other.item_name) , _height (1.0) , _recregion (other._recregion) @@ -187,10 +204,16 @@ TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color cons if (visibility & ShowFrame) { frame = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, 0.0, - trackview.editor().sample_to_pixel(duration), - trackview.current_height())); + trackview.editor().sample_to_pixel(duration) + RIGHT_EDGE_SHIFT, + trackview.current_height() - 1.0)); CANVAS_DEBUG_NAME (frame, string_compose ("frame for %1", get_item_name())); + + if (Config->get_show_name_highlight()) { + frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT)); + } else { + frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::BOTTOM)); + } if (_recregion) { frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RecordingRect()); @@ -198,31 +221,29 @@ TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color cons frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame()); } - // frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::LEFT)); - } else { frame = 0; } - - if (visibility & ShowNameHighlight) { + + if (Config->get_show_name_highlight() && (visibility & ShowNameHighlight)) { double width; double start; if (visibility & FullWidthNameHighlight) { start = 0.0; - width = trackview.editor().sample_to_pixel(item_duration); + width = trackview.editor().sample_to_pixel(item_duration) + RIGHT_EDGE_SHIFT; } else { start = 1.0; - width = trackview.editor().sample_to_pixel(item_duration) - 2.0; + width = trackview.editor().sample_to_pixel(item_duration) - 2.0 + RIGHT_EDGE_SHIFT; } name_highlight = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (start, trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, - width - 4, - trackview.current_height())); + width - 2.0 + RIGHT_EDGE_SHIFT, + trackview.current_height() - 1.0)); 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); @@ -235,7 +256,11 @@ TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color cons if (visibility & ShowNameText) { 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)); + if (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)); + } name_text->set_font_description (NAME_FONT); } else { name_text = 0; @@ -322,28 +347,21 @@ TimeAxisViewItem::set_position(framepos_t pos, void* src, double* delta) frame_position = pos; - /* This sucks. The GnomeCanvas version I am using - doesn't correctly implement gnome_canvas_group_set_arg(), - so that simply setting the "x" arg of the group - fails to move the group. Instead, we have to - use gnome_canvas_item_move(), which does the right - thing. I see that in GNOME CVS, the current (Sept 2001) - version of GNOME Canvas rectifies this issue cleanly. - */ - - double old_unit_pos; - double new_unit_pos = pos / samples_per_pixel; - - old_unit_pos = group->position().x; - - if (new_unit_pos != old_unit_pos) { - group->set_x_position (new_unit_pos); - } + double new_unit_pos = trackview.editor().sample_to_pixel (pos); if (delta) { - (*delta) = new_unit_pos - old_unit_pos; + (*delta) = new_unit_pos - group->position().x; + if (*delta == 0.0) { + return true; + } + } else { + if (new_unit_pos == group->position().x) { + return true; + } } + group->set_x_position (new_unit_pos); + PositionChanged (frame_position, src); /* EMIT_SIGNAL */ return true; @@ -572,7 +590,11 @@ TimeAxisViewItem::set_height (double height) manage_name_highlight (); if (visibility & ShowNameText) { - name_text->set_y_position (height - NAME_Y_OFFSET); + if (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) { @@ -583,7 +605,7 @@ TimeAxisViewItem::set_height (double height) } } - vestigial_frame->set_y1 (height - 1); + vestigial_frame->set_y1 (height - 1.0); set_colors (); } @@ -610,12 +632,7 @@ TimeAxisViewItem::manage_name_highlight () if (name_highlight && wide_enough_for_name && high_enough_for_name) { name_highlight->show(); - - name_highlight->set_y0 ((double) _height - 1 - NAME_HIGHLIGHT_SIZE); - name_highlight->set_y1 ((double) _height - 1); - - /* x0 is always zero */ - name_highlight->set_x1 (_width-1.0); + name_highlight->set (ArdourCanvas::Rect (0.0, (double) _height - NAME_HIGHLIGHT_SIZE, _width+RIGHT_EDGE_SHIFT, (double) _height - 1.0)); } else { name_highlight->hide(); @@ -657,90 +674,14 @@ TimeAxisViewItem::get_name_highlight() void TimeAxisViewItem::compute_colors (Gdk::Color const & base_color) { - unsigned char radius; - char minor_shift; - unsigned char r,g,b; - /* FILL: this is simple */ - r = base_color.get_red()/256; - g = base_color.get_green()/256; - b = base_color.get_blue()/256; - fill_color = RGBA_TO_UINT(r,g,b,160); - - /* for minor colors: - if the overall saturation is strong, make the minor colors light. - if its weak, make them dark. - - we do this by moving an equal distance to the other side of the - central circle in the color wheel from where we started. - */ - - radius = (unsigned char) rint (floor (sqrt (static_cast(r*r + g*g + b+b))/3.0f)); - minor_shift = 125 - radius; - - /* LABEL: rotate around color wheel by 120 degrees anti-clockwise */ + /* FILL: change opacity to a fixed value */ r = base_color.get_red()/256; g = base_color.get_green()/256; b = base_color.get_blue()/256; - - if (r > b) - { - if (r > g) - { - /* red sector => green */ - swap (r,g); - } - else - { - /* green sector => blue */ - swap (g,b); - } - } - else - { - if (b > g) - { - /* blue sector => red */ - swap (b,r); - } - else - { - /* green sector => blue */ - swap (g,b); - } - } - - r += minor_shift; - b += minor_shift; - g += minor_shift; - - label_color = RGBA_TO_UINT(r,g,b,255); - r = (base_color.get_red()/256) + 127; - g = (base_color.get_green()/256) + 127; - b = (base_color.get_blue()/256) + 127; - - label_color = RGBA_TO_UINT(r,g,b,255); - - /* XXX can we do better than this ? */ - /* We're trying;) */ - /* NUKECOLORS */ - - //frame_color_r = 192; - //frame_color_g = 192; - //frame_color_b = 194; - - //selected_frame_color_r = 182; - //selected_frame_color_g = 145; - //selected_frame_color_b = 168; - - //handle_color_r = 25; - //handle_color_g = 0; - //handle_color_b = 255; - //lock_handle_color_r = 235; - //lock_handle_color_g = 16; - //lock_handle_color_b = 16; + fill_color = RGBA_TO_UINT(r,g,b,160); } /** @@ -752,75 +693,85 @@ TimeAxisViewItem::set_colors() set_frame_color(); if (name_highlight) { - name_highlight->set_fill_color (fill_color); + 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; + set_name_text_color (); + set_trim_handle_colors(); +} - ArdourCanvas::color_to_rgba (fill_color, r, g, b, a); - - /* Use W3C contrast guideline calculation */ +void +TimeAxisViewItem::set_name_text_color () +{ + if (!name_text) { + return; + } + + double r, g, b, a; - 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)); + const double black_r = 0.0; + const double black_g = 0.0; + const double black_b = 0.0; - 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)); + const double white_r = 1.0; + const double white_g = 1.0; + const double white_b = 1.0; - 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)); - } + uint32_t f; + + if (Config->get_show_name_highlight()) { + /* name text will always be on top of name highlight, which + will always use our fill color. + */ + f = fill_color; + } else { + /* name text will be on top of the item, whose color + may vary depending on various conditions. + */ + f = get_fill_color (); + } -#if 0 - double h, s, v; + ArdourCanvas::color_to_rgba (f, r, g, b, a); - ArdourCanvas::color_to_hsv (fill_color, h, s, v); + /* Use W3C contrast guideline calculation */ - 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 { + 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)); - 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 + 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)); } - - set_trim_handle_colors(); } uint32_t TimeAxisViewItem::get_fill_color () const { - uint32_t f = 0; + uint32_t f; + uint32_t o; if (_selected) { f = ARDOUR_UI::config()->get_canvasvar_SelectedFrameBase(); + if (fill_opacity != 0) { + o = fill_opacity; + } else { + /* 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) { @@ -833,9 +784,18 @@ TimeAxisViewItem::get_fill_color () const f = fill_color; } } + + /* tweak opacity */ + + if (!rect_visible) { + o = 0; + } else { + o = fill_opacity; + } + } - return f; + return UINT_RGBA_CHANGE_A (f, o); } /** @@ -844,26 +804,16 @@ TimeAxisViewItem::get_fill_color () const 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); + frame->set_fill_color (get_fill_color()); set_frame_gradient (); if (!_recregion) { + uint32_t f; + if (_selected) { f = ARDOUR_UI::config()->get_canvasvar_SelectedTimeAxisFrame(); } else { @@ -871,6 +821,7 @@ TimeAxisViewItem::set_frame_color() } if (!rect_visible) { + /* make the frame outline be visible but rather transparent */ f = UINT_RGBA_CHANGE_A (f, 64); } @@ -914,6 +865,13 @@ TimeAxisViewItem::set_frame_gradient () void TimeAxisViewItem::set_trim_handle_colors() { +#if 1 + /* Leave them transparent for now */ + if (frame_handle_start) { + frame_handle_start->set_fill_color (0x00000000); + frame_handle_end->set_fill_color (0x00000000); + } +#else if (frame_handle_start) { if (position_locked) { frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandleLocked()); @@ -923,6 +881,7 @@ TimeAxisViewItem::set_trim_handle_colors() frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandle()); } } +#endif } bool @@ -930,10 +889,19 @@ TimeAxisViewItem::frame_handle_crossing (GdkEvent* ev, ArdourCanvas::Rectangle* { switch (ev->type) { case GDK_LEAVE_NOTIFY: + /* always hide the handle whenever we leave, no matter what mode */ item->set_fill (false); break; case GDK_ENTER_NOTIFY: - item->set_fill (true); + 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. + */ + item->set_fill (true); + } break; default: break; @@ -968,6 +936,7 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) _width = pixel_width; manage_name_highlight (); + manage_name_text (); if (pixel_width < 2.0) { @@ -989,7 +958,7 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) if (frame) { frame->show(); - frame->set_x1 (pixel_width); + frame->set_x1 (pixel_width + RIGHT_EDGE_SHIFT); } if (frame_handle_start) { @@ -1004,8 +973,8 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) frame_handle_end->hide(); } else { frame_handle_start->show(); - frame_handle_end->set_x0 (pixel_width - (TimeAxisViewItem::GRAB_HANDLE_WIDTH)); - frame_handle_end->set_x1 (pixel_width); + frame_handle_end->set_x0 (pixel_width + RIGHT_EDGE_SHIFT - (TimeAxisViewItem::GRAB_HANDLE_WIDTH)); + frame_handle_end->set_x1 (pixel_width + RIGHT_EDGE_SHIFT); frame_handle_end->show(); } }