X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fview.cpp;h=d48bbabebd4088e0b49128e00f5152577350b6b6;hb=be9e7b4bb29b6594ec2b64442748ab135b684bf8;hp=615802239e2486d1a37d44705f0c98c98265ba80;hpb=5c47d6c11c336a963c0251b55313bab3fababcaa;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 61580223..d48bbabe 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -67,9 +67,6 @@ const double View::MinScale = 1e-15;
 
 const int View::MaxScrollValue = INT_MAX / 2;
 
-const int View::SignalHeight = 30;
-const int View::SignalMargin = 10;
-
 const QColor View::CursorAreaColour(220, 231, 243);
 
 const QSizeF View::LabelPadding(4, 0);
@@ -323,20 +320,6 @@ const QPoint& View::hover_point() const
 	return _hover_point;
 }
 
-void View::normalize_layout()
-{
-	int v_min = INT_MAX;
-	for (const shared_ptr<RowItem> r : *this)
-		v_min = min(r->v_offset(), v_min);
-
-	const int delta = -min(v_min, 0);
-	for (shared_ptr<RowItem> r : *this)
-		r->set_v_offset(r->v_offset() + delta);
-
-	verticalScrollBar()->setSliderPosition(_v_offset + delta);
-	v_scroll_value_changed(verticalScrollBar()->sliderPosition());
-}
-
 void View::update_viewport()
 {
 	assert(_viewport);
@@ -386,9 +369,11 @@ void View::update_scroll()
 
 	// Set the vertical scrollbar
 	verticalScrollBar()->setPageStep(areaSize.height());
-	verticalScrollBar()->setRange(0,
-		_viewport->get_total_height() + SignalMargin -
-		areaSize.height());
+
+	const pair<int, int> extents = v_extents();
+	const int extra_scroll_height = (extents.second - extents.first) / 4;
+	verticalScrollBar()->setRange(extents.first - extra_scroll_height,
+		extents.first + extra_scroll_height);
 }
 
 void View::update_layout()
@@ -513,14 +498,17 @@ void View::signals_changed()
 #endif
 
 	// Create the initial layout
-	int offset = SignalMargin + SignalHeight;
+	int offset = 0;
 	for (shared_ptr<RowItem> r : *this) {
-		r->set_v_offset(offset);
-		offset += SignalHeight + 2 * SignalMargin;
+		const pair<int, int> extents = r->v_extents();
+		if (r->enabled())
+			offset += -extents.first;
+		r->force_to_v_offset(offset);
+		if (r->enabled())
+			offset += extents.second;
 	}
 
 	update_layout();
-	normalize_layout();
 
 	// Update the child widgets
 	_header->signals_updated();