more pre-commit testing

[ardour.git] / gtk2_ardour / time_axis_view_item.cc

diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 8c38293442eac78e840177a029177b4dd1254d2f..9a0e37708d79aa3f7d8af2fa13bc414531a332b0 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -95,7 +95,7 @@ TimeAxisViewItem::set_constant_heights ()
                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 {
@@ -169,7 +169,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;
@@ -191,7 +191,7 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
        }
 
        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()));
@@ -207,7 +207,7 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
                }
        }
        
-       if (Config->get_show_name_highlight() && (visibility & ShowNameHighlight)) {
+       if (ARDOUR_UI::config()->get_show_name_highlight() && (visibility & ShowNameHighlight)) {
 
                double width;
                double start = 1.0;
@@ -235,7 +235,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 (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));
@@ -317,7 +317,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;
@@ -355,7 +354,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;
@@ -511,7 +513,7 @@ TimeAxisViewItem::set_selected(bool yn)
 
        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);
@@ -564,7 +566,7 @@ TimeAxisViewItem::set_height (double height)
        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); 
@@ -676,7 +678,7 @@ TimeAxisViewItem::set_name_text_color ()
 
        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.
                */
@@ -691,49 +693,20 @@ TimeAxisViewItem::set_name_text_color ()
        name_text->set_color (ArdourCanvas::contrasting_text_color (f));
 }
 
-uint32_t
-TimeAxisViewItem::fill_opacity () const
-{
-       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 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);
 }
 
 /**
@@ -849,7 +822,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
@@ -865,7 +842,7 @@ 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"));
@@ -891,6 +868,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) {