X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=546176b44acccb187086654522ac1966db1ad234;hp=08dc8828357d0e704a45dc6782411024968a7381;hb=66e4eae9ce743016c3f6d4974bceb9b7fc0ae7d7;hpb=ae5f66281c38a76dcb7011907d7a86a99b9dd4dd diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 08dc882..546176b 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -827,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) || (!size_finalized_)) { - scroll_needs_defaults_ = true; - return; - } else { - scroll_needs_defaults_ = false; - } - const pair extents = v_extents(); const int trace_height = extents.second - extents.first; @@ -847,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()