From 4cc2e925cf5056bc11514cc44da820eada72ce56 Mon Sep 17 00:00:00 2001 From: Soeren Apel Date: Tue, 6 Jun 2017 15:57:27 +0200 Subject: [PATCH] View: Introduce settings_restored_ This way, UI elements can decide whether they can change UI settings or whether they are already using user-set values. --- pv/view/view.cpp | 7 ++++++- pv/view/view.hpp | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 1cb03afc..f1486ad9 100644 --- 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), @@ -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 > View::time_items() const @@ -1088,7 +1091,9 @@ void View::on_splitter_moved() void View::on_repeat_splitter_expansion() { - expand_header_to_fit(); + // Don't mess with the header if settings were restored in the meanwhile + if (!settings_restored_) + expand_header_to_fit(); } void View::h_scroll_value_changed(int value) diff --git a/pv/view/view.hpp b/pv/view/view.hpp index 9b6ce3ff..08e17d60 100644 --- a/pv/view/view.hpp +++ b/pv/view/view.hpp @@ -426,6 +426,8 @@ private: pv::util::Timestamp offset_; bool updating_scroll_; + bool settings_restored_; + bool sticky_scrolling_; bool coloured_bg_; bool always_zoom_to_fit_; -- 2.30.2