X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=5959ff7b3f94f1288e2c02187a47b802da091704;hb=6644424f1ea61ee7e1f048bfac09acd4a094feab;hp=6549e51bf85041a225b215c2268989461f7ceae1;hpb=39ab01e794a0c13cfc012e90dd17eaebc234fb38;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 6549e51b..5959ff7b 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -155,8 +155,9 @@ View::View(Session &session, QWidget *parent) :
 	next_flag_text_('A'),
 	trigger_markers_(),
 	hover_point_(-1, -1),
-	scroll_needs_defaults(false),
-	saved_v_offset_(0)
+	scroll_needs_defaults_(false),
+	saved_v_offset_(0),
+	size_finalized_(false)
 {
 	connect(scrollarea_.horizontalScrollBar(), SIGNAL(valueChanged(int)),
 		this, SLOT(h_scroll_value_changed(int)));
@@ -324,7 +325,7 @@ void View::restore_settings(QSettings &settings)
 	if (settings.contains("v_offset")) {
 		saved_v_offset_ = settings.value("v_offset").toInt();
 		set_v_offset(saved_v_offset_);
-		scroll_needs_defaults = false;
+		scroll_needs_defaults_ = false;
 		// Note: see resizeEvent() for additional information
 	}
 }
@@ -811,7 +812,7 @@ void View::update_scroll()
 		vscrollbar->setRange(extents.first - areaSize.height(),
 			extents.second);
 
-	if (scroll_needs_defaults)
+	if (scroll_needs_defaults_)
 		set_scroll_default();
 }
 
@@ -826,15 +827,6 @@ void View::set_scroll_default()
 
 	const QSize areaSize = viewport_->size();
 
-	// Special case: when starting up and the window isn't visible yet,
-	// areaSize is [0, 0]. In this case we want to be called again later
-	if (areaSize.height() == 0) {
-		scroll_needs_defaults = true;
-		return;
-	} else {
-		scroll_needs_defaults = false;
-	}
-
 	const pair<int, int> extents = v_extents();
 	const int trace_height = extents.second - extents.first;
 
@@ -846,6 +838,11 @@ void View::set_scroll_default()
 	else
 		// Put the first trace at the top, letting the bottom ones overflow
 		set_v_offset(extents.first);
+
+	// If we're not sure whether setting the defaults worked as
+	// the window wasn't set up entirely yet, we want to be called
+	// again later to make sure
+	scroll_needs_defaults_ = !size_finalized_;
 }
 
 void View::update_layout()
@@ -974,15 +971,22 @@ void View::resizeEvent(QResizeEvent*)
 	// set_v_offset() from within restore_settings() as the view
 	// at that point is neither visible nor properly sized.
 	// This is the least intrusive workaround I could come up
-	// with: set the vertical offset when the view is visible and
-	// resized to its final size. Resize events that are sent
-	// when the view is invisible must be ignored as they have
-	// wrong sizes, potentially preventing the v offset to be
-	// set successfully.
-	if (isVisible() && saved_v_offset_) {
+	// with: set the vertical offset (or scroll defaults) when
+	// the view is visible and resized to its final size.
+	// Resize events that are sent when the view is not visible
+	// must be ignored as they have wrong sizes, potentially
+	// preventing the v offset from being set successfully.
+
+	if (isVisible())
+		size_finalized_ = true;
+
+	if (size_finalized_ && saved_v_offset_) {
 		set_v_offset(saved_v_offset_);
 		saved_v_offset_ = 0;
 	}
+
+	if (size_finalized_ && scroll_needs_defaults_)
+		set_scroll_default();
 }
 
 void View::row_item_appearance_changed(bool label, bool content)
@@ -1188,11 +1192,11 @@ void View::signals_changed()
 		}
 
 	// Add and position the pending top levels items
+	int offset = v_extents().second;
 	for (auto item : new_top_level_items) {
 		add_child_item(item);
 
 		// Position the item after the last item or at the top if there is none
-		int offset = v_extents().second;
 		const pair<int, int> extents = item->v_extents();
 
 		if (item->enabled())