Tie the "use coloured bg" setting in with the settings mgmt

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 546176b44acccb187086654522ac1966db1ad234..f6048f0401c3c8a16826307528f2861b2fbb31db 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -57,6 +57,7 @@
 #include "viewport.hpp"
 
 #include "pv/session.hpp"
+#include "pv/globalsettings.hpp"
 #include "pv/devices/device.hpp"
 #include "pv/data/logic.hpp"
 #include "pv/data/logicsegment.hpp"
@@ -159,6 +160,9 @@ View::View(Session &session, QWidget *parent) :
        saved_v_offset_(0),
        size_finalized_(false)
 {
+       GlobalSettings settings;
+       coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
+
        connect(scrollarea_.horizontalScrollBar(), SIGNAL(valueChanged(int)),
                this, SLOT(h_scroll_value_changed(int)));
        connect(scrollarea_.verticalScrollBar(), SIGNAL(valueChanged(int)),
@@ -563,6 +567,11 @@ void View::enable_sticky_scrolling(bool state)
        sticky_scrolling_ = state;
 }
 
+void View::toggle_sticky_scrolling(void)
+{
+       sticky_scrolling_ = !sticky_scrolling_;
+}
+
 void View::enable_coloured_bg(bool state)
 {
        const vector<shared_ptr<TraceTreeItem>> items(
@@ -1192,11 +1201,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())