X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view_item.cc;h=4f36eb7e6d25d62a099b14d640b22896ad77151d;hb=d6b5c23579dc02d2f98fc1f48bf038c1070057fb;hp=60b39e1c717a0af3aa0ccbe9b2d5de46687a06a4;hpb=ccbedaee51fb5685311a34c8e8fb45d3c6336a7b;p=ardour.git diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 60b39e1c71..4f36eb7e6d 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -32,24 +32,18 @@ #include "canvas/rectangle.h" #include "canvas/debug.h" #include "canvas/text.h" -#include "canvas/colors.h" +#include "gtkmm2ext/colors.h" #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" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Editing; @@ -72,37 +66,37 @@ 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; - win.add (foo); + Gtk::Window win; + Gtk::Label foo; + win.add (foo); - Glib::RefPtr layout = foo.create_pango_layout (X_("Hg")); /* ascender + descender */ - int width = 0; - int height = 0; + Glib::RefPtr layout = foo.create_pango_layout (X_("Hg")); /* ascender + descender */ + int width = 0; + int height = 0; - layout->set_font_description (NAME_FONT); - get_pixel_size (layout, width, height); + layout->set_font_description (NAME_FONT); + get_pixel_size (layout, width, height); - layout = foo.create_pango_layout (X_("H")); /* just the ascender */ + layout = foo.create_pango_layout (X_("H")); /* just the ascender */ - NAME_HEIGHT = height; + 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 { NAME_Y_OFFSET = 3; NAME_HIGHLIGHT_SIZE = 0; } - NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 3; + NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 3; } /** @@ -120,12 +114,12 @@ TimeAxisViewItem::set_constant_heights () */ TimeAxisViewItem::TimeAxisViewItem( const string & it_name, ArdourCanvas::Item& parent, TimeAxisView& tv, double spu, uint32_t base_color, - framepos_t start, framecnt_t duration, bool recording, bool automation, Visibility vis + samplepos_t start, samplecnt_t duration, bool recording, bool automation, Visibility vis ) : trackview (tv) - , frame_position (-1) + , sample_position (-1) , item_name (it_name) - , selection_frame (0) + , selection_sample (0) , _height (1.0) , _recregion (recording) , _automation (automation) @@ -140,9 +134,9 @@ TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other) , Selectable (other) , PBD::ScopedConnectionList() , trackview (other.trackview) - , frame_position (-1) + , sample_position (-1) , item_name (other.item_name) - , selection_frame (0) + , selection_sample (0) , _height (1.0) , _recregion (other._recregion) , _automation (other._automation) @@ -152,81 +146,67 @@ 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, + + init (parent, other.samples_per_pixel, other.fill_color, other.sample_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, + samplepos_t start, samplepos_t duration, Visibility vis, bool wide, bool high) { group = new ArdourCanvas::Container (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)); fill_color = base_color; + fill_color_name = "time axis view item base"; samples_per_pixel = fpp; - frame_position = start; + sample_position = start; item_duration = duration; name_connected = false; position_locked = false; - max_item_duration = ARDOUR::max_framepos; + max_item_duration = Temporal::max_samplepos; min_item_duration = 0; - show_vestigial = true; visibility = vis; _sensitive = true; name_text_width = 0; last_item_width = 0; wide_enough_for_name = wide; high_enough_for_name = high; - rect_visible = true; - vestigial_frame = 0; if (duration == 0) { warning << "Time Axis Item Duration == 0" << endl; } if (visibility & ShowFrame) { - frame = new ArdourCanvas::TimeRectangle (group, - ArdourCanvas::Rect (0.0, 0.0, - trackview.editor().sample_to_pixel(duration), + sample = 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())); + sample->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT)); + sample->show (); + + CANVAS_DEBUG_NAME (sample, string_compose ("sample for %1", get_item_name())); if (_recregion) { - frame->set_outline_color (ARDOUR_UI::config()->color ("recording rect")); + sample->set_outline_color (UIConfiguration::instance().color ("recording rect")); } else { - frame->set_outline_color (ARDOUR_UI::config()->color ("time axis frame")); + sample->set_outline_color (UIConfiguration::instance().color ("time axis frame")); } } - - if (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; - } + if (UIConfiguration::instance().get_show_name_highlight() && (visibility & ShowNameHighlight)) { - 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_what (ArdourCanvas::Rectangle::TOP); + name_highlight->set_outline_color (RGBA_TO_UINT (0,0,0,255)); // this should use a theme color } else { name_highlight = 0; @@ -235,7 +215,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)); @@ -251,28 +231,29 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co double top = TimeAxisViewItem::GRAB_HANDLE_TOP; double width = TimeAxisViewItem::GRAB_HANDLE_WIDTH; - frame_handle_start = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height())); - 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())); - 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)); + sample_handle_start = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height())); + CANVAS_DEBUG_NAME (sample_handle_start, "TAVI sample handle start"); + sample_handle_start->set_outline (false); + sample_handle_start->set_fill (false); + sample_handle_start->Event.connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisViewItem::sample_handle_crossing), sample_handle_start)); + + sample_handle_end = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height())); + CANVAS_DEBUG_NAME (sample_handle_end, "TAVI sample handle end"); + sample_handle_end->set_outline (false); + sample_handle_end->set_fill (false); + sample_handle_end->Event.connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisViewItem::sample_handle_crossing), sample_handle_end)); } else { - frame_handle_start = frame_handle_end = 0; + sample_handle_start = sample_handle_end = 0; } - set_color (base_color); + //set_color (base_color); - set_duration (item_duration, this); - set_position (start, this); + //set_duration (item_duration, this); + //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)); + group->Event.connect (sigc::mem_fun (*this, &TimeAxisViewItem::canvas_group_event)); + //Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&TimeAxisViewItem::parameter_changed, this, _1), gui_context ()); + UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &TimeAxisViewItem::parameter_changed)); } TimeAxisViewItem::~TimeAxisViewItem() @@ -286,30 +267,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. * @@ -319,13 +276,13 @@ TimeAxisViewItem::show_rect () */ bool -TimeAxisViewItem::set_position(framepos_t pos, void* src, double* delta) +TimeAxisViewItem::set_position(samplepos_t pos, void* src, double* delta) { if (position_locked) { return false; } - frame_position = pos; + sample_position = pos; double new_unit_pos = trackview.editor().sample_to_pixel (pos); @@ -341,17 +298,16 @@ TimeAxisViewItem::set_position(framepos_t pos, void* src, double* delta) } group->set_x_position (new_unit_pos); - - PositionChanged (frame_position, src); /* EMIT_SIGNAL */ + PositionChanged (sample_position, src); /* EMIT_SIGNAL */ return true; } /** @return position of this item on the timeline */ -framepos_t +samplepos_t TimeAxisViewItem::get_position() const { - return frame_position; + return sample_position; } /** @@ -363,11 +319,11 @@ TimeAxisViewItem::get_position() const */ bool -TimeAxisViewItem::set_duration (framecnt_t dur, void* src) +TimeAxisViewItem::set_duration (samplecnt_t dur, void* src) { if ((dur > max_item_duration) || (dur < min_item_duration)) { warning << string_compose ( - P_("new duration %1 frame is out of bounds for %2", "new duration of %1 frames is out of bounds for %2", dur), + P_("new duration %1 sample is out of bounds for %2", "new duration of %1 samples is out of bounds for %2", dur), get_item_name(), dur) << endmsg; return false; @@ -379,14 +335,17 @@ 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 (sample_position + dur); + double first_pixel = trackview.editor().sample_to_pixel (sample_position); + + reset_width_dependent_items (end_pixel - first_pixel); DurationChanged (dur, src); /* EMIT_SIGNAL */ return true; } /** @return duration of this item */ -framepos_t +samplepos_t TimeAxisViewItem::get_duration() const { return item_duration; @@ -399,14 +358,14 @@ TimeAxisViewItem::get_duration() const * @param src the identity of the object that initiated the change */ void -TimeAxisViewItem::set_max_duration(framecnt_t dur, void* src) +TimeAxisViewItem::set_max_duration(samplecnt_t dur, void* src) { max_item_duration = dur; MaxDurationChanged(max_item_duration, src); /* EMIT_SIGNAL */ } /** @return the maximum duration that this item may have */ -framecnt_t +samplecnt_t TimeAxisViewItem::get_max_duration() const { return max_item_duration; @@ -419,14 +378,14 @@ TimeAxisViewItem::get_max_duration() const * @param src the identity of the object that initiated the change */ void -TimeAxisViewItem::set_min_duration(framecnt_t dur, void* src) +TimeAxisViewItem::set_min_duration(samplecnt_t dur, void* src) { min_item_duration = dur; MinDurationChanged(max_item_duration, src); /* EMIT_SIGNAL */ } /** @return the minimum duration that this item mey have */ -framecnt_t +samplecnt_t TimeAxisViewItem::get_min_duration() const { return min_item_duration; @@ -528,23 +487,23 @@ TimeAxisViewItem::set_selected(bool yn) if (_selected == yn) { return; } - + Selectable::set_selected (yn); - set_frame_color (); + set_sample_color (); set_name_text_color (); - if (_selected && frame) { - if (!selection_frame) { - selection_frame = new ArdourCanvas::TimeRectangle (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); + if (_selected && sample) { + if (!selection_sample) { + selection_sample = new ArdourCanvas::Rectangle (group); + selection_sample->set_fill (false); + selection_sample->set_outline_color (UIConfiguration::instance().color ("selected time axis frame")); + selection_sample->set_ignore_events (true); } - selection_frame->set (frame->get().shrink (1.0)); - selection_frame->show (); + selection_sample->set (sample->get().shrink (1.0)); + selection_sample->show (); } else { - if (selection_frame) { - selection_frame->hide (); + if (selection_sample) { + selection_sample->hide (); } } } @@ -572,7 +531,8 @@ 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 (); + manage_name_highlight (); } /** @@ -583,39 +543,32 @@ TimeAxisViewItem::set_name_text(const string& new_name) void TimeAxisViewItem::set_height (double height) { - _height = height; + _height = 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_y1 (height); + if (sample) { - if (frame_handle_start) { - frame_handle_start->set_y1 (height); - frame_handle_end->set_y1 (height); - } + sample->set_y0 (0.0); + sample->set_y1 (height); - if (selection_frame) { - selection_frame->set (frame->get().shrink (1.0)); + if (sample_handle_start) { + sample_handle_start->set_y1 (height); + sample_handle_end->set_y1 (height); } - } - if (vestigial_frame) { - vestigial_frame->set_y0 (1.0); - vestigial_frame->set_y1 (height); + if (selection_sample) { + selection_sample->set (sample->get().shrink (1.0)); + } } - - set_colors (); } void @@ -640,8 +593,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(); } @@ -657,9 +611,9 @@ TimeAxisViewItem::set_color (uint32_t base_color) } ArdourCanvas::Item* -TimeAxisViewItem::get_canvas_frame() +TimeAxisViewItem::get_canvas_sample() { - return frame; + return sample; } ArdourCanvas::Item* @@ -680,10 +634,10 @@ TimeAxisViewItem::get_name_highlight() void TimeAxisViewItem::set_colors() { - set_frame_color (); + set_sample_color (); if (name_highlight) { - name_highlight->set_fill_color (fill_color); + name_highlight->set_fill_color (fill_color); } set_name_text_color (); @@ -696,11 +650,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. */ @@ -712,116 +666,71 @@ TimeAxisViewItem::set_name_text_color () f = get_fill_color (); } - name_text->set_color (ArdourCanvas::contrasting_text_color (f)); + name_text->set_color (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 ("region base", "region base"); - return UINT_RGBA_A (col); -} - -uint32_t +Gtkmm2ext::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_mod ("region base", "region base"); - } 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); } /** - * Sets the frame color depending on whether this item is selected + * Sets the sample color depending on whether this item is selected */ void -TimeAxisViewItem::set_frame_color() +TimeAxisViewItem::set_sample_color() { - if (!frame) { + if (!sample) { return; } - frame->set_fill_color (get_fill_color()); - set_frame_gradient (); + sample->set_fill_color (get_fill_color()); + set_sample_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); + sample->set_outline_color (UIConfiguration::instance().color ("time axis frame")); } } void -TimeAxisViewItem::set_frame_gradient () +TimeAxisViewItem::set_sample_gradient () { - if (ARDOUR_UI::config()->get_timeline_item_gradient_depth() == 0.0) { - frame->set_gradient (ArdourCanvas::Fill::StopList (), 0); + if (UIConfiguration::instance().get_timeline_item_gradient_depth() == 0.0) { + sample->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()); + Color f (get_fill_color()); /* need to get alpha value */ - ArdourCanvas::color_to_rgba (f, r, g, b, a); - + 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::hsva_to_color (h, s, v, a); + color_to_hsv (f, h, s, v); + + v = min (1.0, v * (1.0 - UIConfiguration::instance().get_timeline_item_gradient_depth())); + + Color darker = hsva_to_color (h, s, v, a); stops.push_back (std::make_pair (1.0, darker)); - - frame->set_gradient (stops, true); + + sample->set_gradient (stops, true); } /** @@ -832,25 +741,25 @@ 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); + if (sample_handle_start) { + sample_handle_start->set_fill_color (0x00000000); + sample_handle_end->set_fill_color (0x00000000); } #else - if (frame_handle_start) { + if (sample_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()); + sample_handle_start->set_fill_color (UIConfiguration::instance().get_TrimHandleLocked()); + sample_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()); + sample_handle_start->set_fill_color (UIConfiguration::instance().get_TrimHandle()); + sample_handle_end->set_fill_color (UIConfiguration::instance().get_TrimHandle()); } } #endif } bool -TimeAxisViewItem::frame_handle_crossing (GdkEvent* ev, ArdourCanvas::Rectangle* item) +TimeAxisViewItem::sample_handle_crossing (GdkEvent* ev, ArdourCanvas::Rectangle* item) { switch (ev->type) { case GDK_LEAVE_NOTIFY: @@ -858,13 +767,10 @@ TimeAxisViewItem::frame_handle_crossing (GdkEvent* ev, ArdourCanvas::Rectangle* 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; @@ -874,25 +780,29 @@ TimeAxisViewItem::frame_handle_crossing (GdkEvent* ev, ArdourCanvas::Rectangle* return false; } -/** @return the frames per pixel */ +/** @return the samples per pixel */ double TimeAxisViewItem::get_samples_per_pixel () const { return samples_per_pixel; } -/** Set the frames per pixel of this item. +/** Set the samples per pixel of this item. * This item is used to determine the relative visual size and position of this item * based upon its duration and start value. * - * @param fpp the new frames per pixel + * @param fpp the new samples per pixel */ void 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 (sample_position + get_duration()); + double first_pixel = trackview.editor().sample_to_pixel (sample_position); + + reset_width_dependent_items (end_pixel - first_pixel); } void @@ -905,57 +815,47 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) if (pixel_width < 2.0) { - if (show_vestigial) { - - if (!vestigial_frame) { - vestigial_frame = new ArdourCanvas::TimeRectangle (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_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT)); - } - - vestigial_frame->show(); + if (sample) { + sample->set_outline (false); + sample->set_x1 (std::max(1.0, pixel_width)); } - if (frame) { - frame->hide(); - } - - if (frame_handle_start) { - frame_handle_start->hide(); - frame_handle_end->hide(); + if (sample_handle_start) { + sample_handle_start->hide(); + sample_handle_end->hide(); } } else { - if (vestigial_frame) { - vestigial_frame->hide(); - } - - if (frame) { - frame->show(); - frame->set_x1 (pixel_width); + if (sample) { + sample->set_outline (true); + /* Note: x0 is always zero - the position is defined by + * the position of the group, not the sample. + */ + sample->set_x1 (pixel_width); - if (selection_frame) { - selection_frame->set (frame->get().shrink (1.0)); + if (selection_sample) { + selection_sample->set (sample->get().shrink (1.0)); } } - if (frame_handle_start) { + if (sample_handle_start) { if (pixel_width < (3 * TimeAxisViewItem::GRAB_HANDLE_WIDTH)) { /* - * 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 + * there's less than GRAB_HANDLE_WIDTH of the region between + * the right-hand end of sample_handle_start and the left-hand + * end of sample_handle_end, so disable the handles */ - frame_handle_start->hide(); - frame_handle_end->hide(); + sample_handle_start->hide(); + sample_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->show(); + sample_handle_start->show(); + sample_handle_end->set_x0 (pixel_width - (TimeAxisViewItem::GRAB_HANDLE_WIDTH)); + sample_handle_end->set_x1 (pixel_width); + sample_handle_end->show(); + + sample_handle_start->raise_to_top (); + sample_handle_end->raise_to_top (); } } } @@ -974,7 +874,7 @@ TimeAxisViewItem::manage_name_text () name_text->hide (); return; } - + if (name_text->text().empty()) { name_text->hide (); } @@ -1022,7 +922,7 @@ TimeAxisViewItem::parameter_changed (string p) if (p == "color-regions-using-track-color") { set_colors (); } else if (p == "timeline-item-gradient-depth") { - set_frame_gradient (); + set_sample_gradient (); } } @@ -1030,12 +930,12 @@ void TimeAxisViewItem::drag_start () { _dragging = true; - set_frame_color (); + set_sample_color (); } void TimeAxisViewItem::drag_end () { _dragging = false; - set_frame_color (); + set_sample_color (); }