Fix #771 by using black with alpha instead of an opaque grey

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index fd6107f63acc9e643518226525593b012ac61485..ea443f23b91cebf4ddb141b64ae3ef4af705b357 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -41,8 +41,9 @@ namespace view {
 const QPen Trace::AxisPen(QColor(0, 0, 0, 30*256/100));
 const int Trace::LabelHitPadding = 2;
 
-const QColor Trace::DarkBGColour(235, 235, 235);    // Quite light grey
-const QColor Trace::BrightBGColour(245, 245, 245);  // Very light grey
+const int Trace::ColourBGAlpha = 8*256/100;
+const QColor Trace::BrightGrayBGColour = QColor(0, 0, 0, 10*255/100);
+const QColor Trace::DarkGrayBGColour = QColor(0, 0, 0, 15*255/100);
 
 Trace::Trace(QString name) :
        name_(name),
@@ -72,7 +73,7 @@ void Trace::set_colour(QColor colour)
        colour_ = colour;
 
        bgcolour_ = colour;
-       bgcolour_.setAlpha(20);
+       bgcolour_.setAlpha(ColourBGAlpha);
 }
 
 void Trace::set_coloured_bg(bool state)
@@ -180,7 +181,7 @@ void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
        if (coloured_bg_)
                p.setBrush(bgcolour_);
        else
-               p.setBrush(bgcolour_state_ ? BrightBGColour : DarkBGColour);
+               p.setBrush(bgcolour_state_ ? BrightGrayBGColour : DarkGrayBGColour);
 
        p.setPen(QPen(Qt::NoPen));
 

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index cb5ac15c6ec2173f14cc3d7dbde1ac298a7a333e..4e95f5654724945e25093d8e7d407ca5e74a2ca4 100644 (file)
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.hpp
@@ -49,8 +49,9 @@ private:
        static const QPen AxisPen;
        static const int LabelHitPadding;
 
-       static const QColor BrightBGColour;
-       static const QColor DarkBGColour;
+       static const int ColourBGAlpha;
+       static const QColor BrightGrayBGColour;
+       static const QColor DarkGrayBGColour;
 
 protected:
        Trace(QString name);