View: Fix view item positioning

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index b5d7beb75d6845637fccb7e4fa1d6183e3b483a8..5959ff7b3f94f1288e2c02187a47b802da091704 100644 (file)
--- 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)));
@@ -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())