megaopus commit: (1) add __STD_(LIMIT|FORMAT)_MACROS to command line flags for cc...

[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 8856fdd4ac3af08b6ebf18511bc0f8b91e92eb37..118f4033a6e64067bb641dede7a86e800ea8bc8f 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -146,7 +146,7 @@ TimeAxisViewItem::init (
        name_connected = false;
        fill_opacity = 60;
        position_locked = false;
-       max_item_duration = ARDOUR::max_frames;
+       max_item_duration = ARDOUR::max_framepos;
        min_item_duration = 0;
        show_vestigial = true;
        visibility = vis;
@@ -187,12 +187,15 @@ TimeAxisViewItem::init (
        if (visibility & ShowNameHighlight) {
                
                if (visibility & FullWidthNameHighlight) {
-                       name_highlight = new ArdourCanvas::SimpleRect (*group, 0.0, trackview.editor().frame_to_pixel(item_duration), trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, trackview.current_height() - 1);
+                       name_highlight = new ArdourCanvas::SimpleRect (*group, 0.0, trackview.editor().frame_to_pixel(item_duration), trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, trackview.current_height());
                } else {
-                       name_highlight = new ArdourCanvas::SimpleRect (*group, 1.0, trackview.editor().frame_to_pixel(item_duration) - 1, trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, trackview.current_height() - 1);
+                       name_highlight = new ArdourCanvas::SimpleRect (*group, 1.0, trackview.editor().frame_to_pixel(item_duration) - 1, trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, trackview.current_height());
                }
                
                name_highlight->set_data ("timeaxisviewitem", this);
+                name_highlight->property_outline_what() = 0x4;
+                /* we should really use a canvas color property here */
+               name_highlight->property_outline_color_rgba() = RGBA_TO_UINT (0,0,0,255);
 
        } else {
                name_highlight = 0;
@@ -519,7 +522,7 @@ TimeAxisViewItem::set_height (double height)
 
                if (height > NAME_HIGHLIGHT_SIZE) {
                        name_highlight->property_y1() = (double) height - 1 - NAME_HIGHLIGHT_SIZE;
-                       name_highlight->property_y2() = (double) height - 2;
+                       name_highlight->property_y2() = (double) height - 1;
                }
                else {
                        /* it gets hidden now anyway */
@@ -680,7 +683,6 @@ TimeAxisViewItem::set_colors()
 
        if (name_highlight) {
                name_highlight->property_fill_color_rgba() = fill_color;
-               name_highlight->property_outline_color_rgba() = fill_color;
        }
        set_trim_handle_colors();
 }