From: Soeren Apel <redacted>
Date: Fri, 13 Jan 2017 07:51:00 +0000 (+0100)
Subject: TraceView: Center traces vertically after view creation
X-Git-Tag: pulseview-0.4.0~208
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=ae5f66281c38a76dcb7011907d7a86a99b9dd4dd;p=pulseview.git

TraceView: Center traces vertically after view creation
---

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index b5d7beb7..08dc8828 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -156,7 +156,8 @@ View::View(Session &session, QWidget *parent) :
 	trigger_markers_(),
 	hover_point_(-1, -1),
 	scroll_needs_defaults_(false),
-	saved_v_offset_(0)
+	saved_v_offset_(0),
+	size_finalized_(false)
 {
 	connect(scrollarea_.horizontalScrollBar(), SIGNAL(valueChanged(int)),
 		this, SLOT(h_scroll_value_changed(int)));
@@ -828,7 +829,7 @@ void View::set_scroll_default()
 
 	// 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) {
+	if ((areaSize.height() == 0) || (!size_finalized_)) {
 		scroll_needs_defaults_ = true;
 		return;
 	} else {
@@ -974,15 +975,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)
diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 42cbe3c2..007ea3b6 100644
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -427,6 +427,8 @@ private:
 
 	// A nonzero value indicates the v offset to restore. See View::resizeEvent()
 	int saved_v_offset_;
+
+	bool size_finalized_;
 };
 
 } // namespace TraceView