TraceView: Center traces vertically after view creation

[pulseview.git] / pv / view / view.cpp

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 6549e51bf85041a225b215c2268989461f7ceae1..08dc8828357d0e704a45dc6782411024968a7381 100644 (file)
--- 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();
 }
 
@@ -828,11 +829,11 @@ 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) {
-               scroll_needs_defaults = true;
+       if ((areaSize.height() == 0) || (!size_finalized_)) {
+               scroll_needs_defaults_ = true;
                return;
        } else {
-               scroll_needs_defaults = false;
+               scroll_needs_defaults_ = false;
        }
 
        const pair<int, int> extents = v_extents();
@@ -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)