X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view_item.cc;h=5a85005e3a1dcab8d0d28f2f759f734b7a2fa160;hb=73d1de3b75172115beb6a30edacb4861893d97fd;hp=2f860d897bfa10e29c760f637c9008ba50ad5d37;hpb=7ab8a11fb53782dfcf67b652dc65d8d177b0a1b6;p=ardour.git diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 2f860d897b..5a85005e3a 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -36,16 +36,10 @@ #include "ardour/profile.h" -#include "ardour_ui.h" -/* - * ardour_ui.h was moved up in the include list - * due to a conflicting definition of 'Rect' between - * Apple's MacTypes.h file and GTK - */ - #include "public_editor.h" #include "time_axis_view_item.h" #include "time_axis_view.h" +#include "ui_config.h" #include "utils.h" #include "rgb_macros.h" @@ -72,7 +66,7 @@ double TimeAxisViewItem::NAME_HIGHLIGHT_THRESH; void TimeAxisViewItem::set_constant_heights () { - NAME_FONT = Pango::FontDescription (ARDOUR_UI::config()->get_SmallFont()); + NAME_FONT = Pango::FontDescription (UIConfiguration::instance().get_SmallFont()); Gtk::Window win; Gtk::Label foo; @@ -89,13 +83,13 @@ TimeAxisViewItem::set_constant_heights () NAME_HEIGHT = height; - /* Config->get_show_name_highlight) == true: + /* Config->get_show_name_highlight) == true: Y_OFFSET is measured from bottom of the time axis view item. - Config->get_show_name_highlight) == false: + 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()) { + if (UIConfiguration::instance().get_show_name_highlight()) { NAME_Y_OFFSET = height + 1; NAME_HIGHLIGHT_SIZE = height + 2; } else { @@ -152,16 +146,16 @@ TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other) /* share the other's parent, but still create a new group */ ArdourCanvas::Item* parent = other.group->parent(); - + _selected = other._selected; - + init (parent, other.samples_per_pixel, other.fill_color, other.frame_position, other.item_duration, other.visibility, other.wide_enough_for_name, other.high_enough_for_name); } void -TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_color, - framepos_t start, framepos_t duration, Visibility vis, +TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_color, + framepos_t start, framepos_t duration, Visibility vis, bool wide, bool high) { group = new ArdourCanvas::Container (parent); @@ -169,7 +163,7 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co group->Event.connect (sigc::mem_fun (*this, &TimeAxisViewItem::canvas_group_event)); fill_color = base_color; - _fill_color_name = "region base"; + fill_color_name = "time axis view item base"; samples_per_pixel = fpp; frame_position = start; item_duration = duration; @@ -184,7 +178,6 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co last_item_width = 0; wide_enough_for_name = wide; high_enough_for_name = high; - rect_visible = true; vestigial_frame = 0; if (duration == 0) { @@ -192,42 +185,30 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co } if (visibility & ShowFrame) { - frame = new ArdourCanvas::TimeRectangle (group, - ArdourCanvas::Rect (0.0, 0.0, - trackview.editor().sample_to_pixel(duration), + frame = new ArdourCanvas::Rectangle (group, + ArdourCanvas::Rect (0.0, 0.0, + trackview.editor().sample_to_pixel(duration), trackview.current_height())); - + frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT)); CANVAS_DEBUG_NAME (frame, string_compose ("frame for %1", get_item_name())); if (_recregion) { - frame->set_outline_color (ARDOUR_UI::config()->color ("recording rect")); + frame->set_outline_color (UIConfiguration::instance().color ("recording rect")); } else { - frame->set_outline_color (ARDOUR_UI::config()->color ("time axis frame")); + frame->set_outline_color (UIConfiguration::instance().color ("time axis frame")); } } - - if (Config->get_show_name_highlight() && (visibility & ShowNameHighlight)) { - double width; - double start = 1.0; + if (UIConfiguration::instance().get_show_name_highlight() && (visibility & ShowNameHighlight)) { - 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; @@ -236,7 +217,7 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co 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 (UIConfiguration::instance().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)); @@ -273,7 +254,7 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co 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)); + UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &TimeAxisViewItem::parameter_changed)); } TimeAxisViewItem::~TimeAxisViewItem() @@ -287,30 +268,6 @@ TimeAxisViewItem::canvas_group_event (GdkEvent* /*ev*/) 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. * @@ -342,7 +299,6 @@ TimeAxisViewItem::set_position(framepos_t pos, void* src, double* delta) } group->set_x_position (new_unit_pos); - PositionChanged (frame_position, src); /* EMIT_SIGNAL */ return true; @@ -380,7 +336,10 @@ TimeAxisViewItem::set_duration (framecnt_t dur, void* src) 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; @@ -529,16 +488,16 @@ TimeAxisViewItem::set_selected(bool yn) if (_selected == yn) { return; } - + Selectable::set_selected (yn); set_frame_color (); set_name_text_color (); 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_outline_color (UIConfiguration::instance().color ("selected time axis frame")); selection_frame->set_ignore_events (true); } selection_frame->set (frame->get().shrink (1.0)); @@ -573,6 +532,7 @@ TimeAxisViewItem::set_name_text(const string& new_name) name_text_width = pixel_width (new_name, NAME_FONT) + 2; name_text->set (new_name); + manage_name_text (); } @@ -589,16 +549,16 @@ TimeAxisViewItem::set_height (double height) manage_name_highlight (); if (visibility & ShowNameText) { - if (Config->get_show_name_highlight()) { - name_text->set_y_position (height - NAME_Y_OFFSET); + if (UIConfiguration::instance().get_show_name_highlight()) { + name_text->set_y_position (height - NAME_Y_OFFSET); } else { - name_text->set_y_position (NAME_Y_OFFSET); + 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) { @@ -612,7 +572,7 @@ TimeAxisViewItem::set_height (double height) } if (vestigial_frame) { - vestigial_frame->set_y0 (1.0); + vestigial_frame->set_y0 (0.0); vestigial_frame->set_y1 (height); } @@ -641,8 +601,9 @@ TimeAxisViewItem::manage_name_highlight () 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(); } @@ -697,11 +658,11 @@ TimeAxisViewItem::set_name_text_color () if (!name_text) { return; } - + uint32_t f; - - if (Config->get_show_name_highlight()) { + + if (UIConfiguration::instance().get_show_name_highlight()) { /* name text will always be on top of name highlight, which will always use our fill color. */ @@ -716,56 +677,20 @@ TimeAxisViewItem::set_name_text_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_mod (_fill_color_name, _fill_color_name); - return UINT_RGBA_A (col); -} - -uint32_t +ArdourCanvas::Color TimeAxisViewItem::get_fill_color () const { - uint32_t f; - uint32_t 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_mod (_fill_color_name, _fill_color_name); - } else { - f = fill_color; - } - } + return UIConfiguration::instance().color_mod ("selected region base", mod_name); + } else if (_recregion) { + return UIConfiguration::instance().color ("recording rect"); + } else if ((!UIConfiguration::instance().get_show_name_highlight() || high_enough_for_name) && + !UIConfiguration::instance().get_color_regions_using_track_color()) { + return UIConfiguration::instance().color_mod (fill_color_name, mod_name); } - - return UINT_RGBA_CHANGE_A (f, o); + return UIConfiguration::instance().color_mod (fill_color, mod_name); } /** @@ -782,18 +707,18 @@ TimeAxisViewItem::set_frame_color() set_frame_gradient (); if (!_recregion) { - frame->set_outline_color (ARDOUR_UI::config()->color ("time axis frame")); + frame->set_outline_color (UIConfiguration::instance().color ("time axis frame")); } } void TimeAxisViewItem::set_frame_gradient () { - if (ARDOUR_UI::config()->get_timeline_item_gradient_depth() == 0.0) { + if (UIConfiguration::instance().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; @@ -801,18 +726,18 @@ TimeAxisViewItem::set_frame_gradient () /* 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())); - + v = min (1.0, v * (1.0 - UIConfiguration::instance().get_timeline_item_gradient_depth())); + ArdourCanvas::Color darker = ArdourCanvas::hsva_to_color (h, s, v, a); stops.push_back (std::make_pair (1.0, darker)); - + frame->set_gradient (stops, true); } @@ -831,11 +756,11 @@ TimeAxisViewItem::set_trim_handle_colors() #else if (frame_handle_start) { if (position_locked) { - frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_TrimHandleLocked()); - frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_TrimHandleLocked()); + frame_handle_start->set_fill_color (UIConfiguration::instance().get_TrimHandleLocked()); + frame_handle_end->set_fill_color (UIConfiguration::instance().get_TrimHandleLocked()); } else { - frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_TrimHandle()); - frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_TrimHandle()); + frame_handle_start->set_fill_color (UIConfiguration::instance().get_TrimHandle()); + frame_handle_end->set_fill_color (UIConfiguration::instance().get_TrimHandle()); } } #endif @@ -881,7 +806,11 @@ TimeAxisViewItem::set_samples_per_pixel (double fpp) { 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 @@ -897,10 +826,10 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) 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")); + vestigial_frame->set_outline_color (UIConfiguration::instance().color ("vestigial frame")); + vestigial_frame->set_fill_color (UIConfiguration::instance().color ("vestigial frame")); vestigial_frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT)); } @@ -923,6 +852,9 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) 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) { @@ -933,7 +865,7 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) if (frame_handle_start) { if (pixel_width < (3 * TimeAxisViewItem::GRAB_HANDLE_WIDTH)) { /* - * there's less than GRAB_HANDLE_WIDTH of the region between + * there's less than GRAB_HANDLE_WIDTH of the region between * the right-hand end of frame_handle_start and the left-hand * end of frame_handle_end, so disable the handles */ @@ -963,7 +895,7 @@ TimeAxisViewItem::manage_name_text () name_text->hide (); return; } - + if (name_text->text().empty()) { name_text->hide (); }