View: Improve 2a9fcd621 by using settings_restored_

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 61b03b2e16b8495b8d8c6e8f0093bb4b7830a978..eeda37ccfdbd1b1dc241b7ac7990d26f37af55d1 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -129,6 +129,7 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
        scale_(1e-3),
        offset_(0),
        updating_scroll_(false),
+       settings_restored_(false),
        sticky_scrolling_(false), // Default setting is set in MainWindow::setup_ui()
        always_zoom_to_fit_(false),
        tick_period_(0),
@@ -140,7 +141,7 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
        next_flag_text_('A'),
        trigger_markers_(),
        hover_point_(-1, -1),
-       scroll_needs_defaults_(false),
+       scroll_needs_defaults_(true),
        saved_v_offset_(0)
 {
        QVBoxLayout *root_layout = new QVBoxLayout(this);
@@ -351,6 +352,8 @@ void View::restore_settings(QSettings &settings)
                scroll_needs_defaults_ = false;
                // Note: see eventFilter() for additional information
        }
+
+       settings_restored_ = true;
 }
 
 vector< shared_ptr<TimeItem> > View::time_items() const
@@ -1013,6 +1016,9 @@ bool View::eventFilter(QObject *object, QEvent *event)
                // resized to their final sizes.
                update_layout();
 
+               if (!settings_restored_)
+                       expand_header_to_fit();
+
                if (scroll_needs_defaults_) {
                        set_scroll_default();
                        scroll_needs_defaults_ = false;