X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=0ca1359138d89317f4c630f6cda71d242c50bc34;hp=e481f2a009753aacd2a82a15eca93bb5a3895761;hb=eb8269e3b5eebdd77e6a82d42bcfdfbc3f7613a9;hpb=efdec55aec1a137460fa362a381ed1904182bfed;ds=sidebyside

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index e481f2a0..0ca13591 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -19,7 +19,7 @@
 
 #include <extdef.h>
 
-#include <assert.h>
+#include <cassert>
 #include <cmath>
 
 #include <QApplication>
@@ -31,8 +31,9 @@
 #include "tracepalette.hpp"
 #include "view.hpp"
 
-#include <pv/widgets/colourbutton.hpp>
-#include <pv/widgets/popup.hpp>
+#include "pv/globalsettings.hpp"
+#include "pv/widgets/colourbutton.hpp"
+#include "pv/widgets/popup.hpp"
 
 namespace pv {
 namespace views {
@@ -46,10 +47,12 @@ const QColor Trace::DarkGrayBGColour = QColor(0, 0, 0, 15*255/100);
 
 Trace::Trace(std::shared_ptr<data::SignalBase> channel) :
 	base_(channel),
-	coloured_bg_(true), // Default setting is set in MainWindow::setup_ui()
 	popup_(nullptr),
 	popup_form_(nullptr)
 {
+	GlobalSettings settings;
+	coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
+
 	connect(channel.get(), SIGNAL(name_changed(const QString&)),
 		this, SLOT(on_name_changed(const QString&)));
 	connect(channel.get(), SIGNAL(colour_changed(const QColor&)),