region list patch #2 from chris g, slightly reworked by me; sv_se po changes, possibl...

[ardour.git] / gtk2_ardour / streamview.cc

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 7539683da5696df32f5e755f4afb6ab07f26d1f5..8730c55f58fd16dec9ece4063d7c760d8f2c890d 100644 (file)
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -67,10 +67,12 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
        canvas_rect->property_y1() = 0.0;
        canvas_rect->property_x2() = _trackview.editor.frame_to_pixel (max_frames - 1);
        canvas_rect->property_y2() = (double) tv.current_height();
+       canvas_rect->raise(1); // raise above tempo lines
 
        // DR-way
-       // canvas_rect->property_outline_what() = (guint32) (0x2|0x8);  // outline RHS and bottom 
-       canvas_rect->property_outline_what() = (guint32) (0x1|0x2|0x8);  // outline ends and bottom 
+       canvas_rect->property_outline_what() = (guint32) (0x2|0x8);  // outline RHS and bottom 
+       // 2.0 way
+       //canvas_rect->property_outline_what() = (guint32) (0x1|0x2|0x8);  // outline ends and bottom 
        // (Fill/Outline colours set in derived classes)
 
        canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_stream_view_event), canvas_rect, &_trackview));
@@ -126,7 +128,7 @@ StreamView::set_height (double h)
        }
 
        height = h;
-       update_contents_y_position_and_height ();
+       update_contents_height ();
        return 0;
 }
 
@@ -228,7 +230,7 @@ StreamView::playlist_modified (boost::shared_ptr<Diskstream> ds)
        /* update layers count and the y positions and heights of our regions */
        if (ds->playlist()) {
                layers = ds->playlist()->top_layer() + 1;
-               update_contents_y_position_and_height ();
+               update_contents_height ();
                redisplay_diskstream ();
        }
 }
@@ -250,7 +252,7 @@ StreamView::playlist_changed (boost::shared_ptr<Diskstream> ds)
 
        /* update layers count and the y positions and heights of our regions */
        layers = ds->playlist()->top_layer() + 1;
-       update_contents_y_position_and_height ();
+       update_contents_height ();
        
        /* draw it */
        redisplay_diskstream ();
@@ -420,7 +422,7 @@ StreamView::get_inverted_selectables (Selection& sel, list<Selectable*>& results
 }
 
 void
-StreamView::update_contents_y_position_and_height ()
+StreamView::update_contents_height ()
 {
        canvas_rect->property_y2() = height;
 
@@ -429,11 +431,12 @@ StreamView::update_contents_y_position_and_height ()
        for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
                switch (layer_display) {
                case Overlaid:
-                       (*i)->set_y_position_and_height (0, height);
+                       (*i)->set_height (height);
                        break;
                case Stacked:
-                       double const y = (*i)->region()->layer() * lh;
-                       (*i)->set_y_position_and_height (y, lh);
+                       cout << "FIXME: Stacked regions: set y position" << endl;
+                       //double const y = (*i)->region()->layer() * lh;
+                       (*i)->set_height (lh);
                        break;
                }
        }
@@ -447,5 +450,5 @@ void
 StreamView::set_layer_display (LayerDisplay d)
 {
        layer_display = d;
-       update_contents_y_position_and_height ();
+       update_contents_height ();
 }