X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view_item.cc;h=0e66ab2bae2b1372344f565c1572471e7a97df30;hb=1315ee3dff1e4966ab28bd47e81b5f003cac6e40;hp=7830e8f437208363baf5a4510fd80342575a387b;hpb=87726495c30f90554b5204b5385d17274a8fe93e;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 7830e8f437..0e66ab2bae 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -567,15 +567,16 @@ TimeAxisViewItem::set_name_text(const ustring& new_name)
 }
 
 /**
- * Set the height of this item
+ * Set the y position and height of this item.
  *
+ * @param y the new y position
  * @param h the new height
  */		
 void
-TimeAxisViewItem::set_height (double height)
+TimeAxisViewItem::set_y_position_and_height (double y, double h)
 {
 	if (name_highlight) {
-		if (height < NAME_HIGHLIGHT_THRESH) {
+		if (h < NAME_HIGHLIGHT_THRESH) {
 			name_highlight->hide();
 			if (name_text) {
 				name_text->hide();
@@ -587,20 +588,20 @@ 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;
+		if (h > NAME_HIGHLIGHT_SIZE) {
+			name_highlight->property_y1() = (double) y + h + 1 - NAME_HIGHLIGHT_SIZE;
+			name_highlight->property_y2() = (double) y + h;
 		}
 		else {
 			/* it gets hidden now anyway */
-			name_highlight->property_y1() = (double) 1.0;
-			name_highlight->property_y2() = (double) height;
+			name_highlight->property_y1() = (double) y;
+			name_highlight->property_y2() = (double) y + h;
 		}
 	}
 
 	if (name_text) {
-		name_text->property_y() = height+1 - NAME_Y_OFFSET;
-		if (height < NAME_HIGHLIGHT_THRESH) {
+		name_text->property_y() = y + h + 1 - NAME_Y_OFFSET;
+		if (h < NAME_HIGHLIGHT_THRESH) {
 			name_text->property_fill_color_rgba() =  fill_color;
 		}
 		else {
@@ -609,10 +610,12 @@ TimeAxisViewItem::set_height (double height)
 	}
 
 	if (frame) {
-		frame->property_y2() = height+1;
+		frame->property_y1() = y;
+		frame->property_y2() = y + h + 1;
 	}
 
-	vestigial_frame->property_y2() = height+1;
+	vestigial_frame->property_y1() = y;
+	vestigial_frame->property_y2() = y + h + 1;
 }
 
 /**