hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Remove warning color from oscilloscope (#5492)

Browse Source
This commit is contained in:
Hussam al-Homsi
2020-07-11 18:40:12 -04:00
committed by GitHub
parent 2da0aaa460
commit d0ef87543d
4 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/themes/classic/style.css
View File

@@ -168,7 +168,6 @@ Oscilloscope {
background: none;
border: none;
qproperty-normalColor: rgb(71, 253, 133);
qproperty-warningColor: rgb(255, 192, 64);
qproperty-clippingColor: rgb(255, 64, 64);
}

1
data/themes/default/style.css
View File

@@ -200,7 +200,6 @@ Oscilloscope {
background: none;
border: none;
qproperty-normalColor: rgb(71, 253, 133);
qproperty-warningColor: rgb(255, 192, 64);
qproperty-clippingColor: rgb(255, 64, 64);
}

5
include/Oscilloscope.h
View File

@@ -37,7 +37,6 @@ class Oscilloscope : public QWidget
Q_OBJECT
public:
Q_PROPERTY( QColor normalColor READ normalColor WRITE setNormalColor )
Q_PROPERTY( QColor warningColor READ warningColor WRITE setWarningColor )
Q_PROPERTY( QColor clippingColor READ clippingColor WRITE setClippingColor )
Oscilloscope( QWidget * _parent );
@@ -48,9 +47,6 @@ public:
QColor const & normalColor() const;
void setNormalColor(QColor const & normalColor);
QColor const & warningColor() const;
void setWarningColor(QColor const & warningColor);
QColor const & clippingColor() const;
void setClippingColor(QColor const & clippingColor);
@@ -74,7 +70,6 @@ private:
bool m_active;
QColor m_normalColor;
QColor m_warningColor;
QColor m_clippingColor;
} ;

17
src/gui/widgets/Oscilloscope.cpp
View File

@@ -44,7 +44,6 @@ Oscilloscope::Oscilloscope( QWidget * _p ) :
m_points( new QPointF[Engine::mixer()->framesPerPeriod()] ),
m_active( false ),
m_normalColor(71, 253, 133),
m_warningColor(255, 192, 64),
m_clippingColor(255, 64, 64)
{
setFixedSize( m_background.width(), m_background.height() );
@@ -121,16 +120,6 @@ void Oscilloscope::setNormalColor(QColor const & normalColor)
m_normalColor = normalColor;
}
QColor const & Oscilloscope::warningColor() const
{
return m_warningColor;
}
void Oscilloscope::setWarningColor(QColor const & warningColor)
{
m_warningColor = warningColor;
}
QColor const & Oscilloscope::clippingColor() const
{
return m_clippingColor;
@@ -205,14 +194,10 @@ void Oscilloscope::mousePressEvent( QMouseEvent * _me )
QColor const & Oscilloscope::determineLineColor(float level) const
{
if( level < 0.9f )
if( level <= 1.0f )
{
return normalColor();
}
else if( level <= 1.0f )
{
return warningColor();
}
else
{
return clippingColor();