jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Simplify Volume Control draw logic

master
Shaolin 2018-04-17 12:54:40 -03:00
parent 5aab9bfb3e
commit 288339ceda
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
UI/volume-control.cpp
View File

@ -634,17 +634,20 @@ void VolumeMeter::paintInputMeter(QPainter &painter, int x, int y, int width,
int height, float peakHold)
{
QMutexLocker locker(&dataMutex);
QColor color;
if (peakHold < minimumInputLevel)
painter.fillRect(x, y, width, height, backgroundNominalColor);
color = backgroundNominalColor;
else if (peakHold < warningLevel)
painter.fillRect(x, y, width, height, foregroundNominalColor);
color = foregroundNominalColor;
else if (peakHold < errorLevel)
painter.fillRect(x, y, width, height, foregroundWarningColor);
color = foregroundWarningColor;
else if (peakHold <= clipLevel)
painter.fillRect(x, y, width, height, foregroundErrorColor);
color = foregroundErrorColor;
else
painter.fillRect(x, y, width, height, clipColor);
color = clipColor;
painter.fillRect(x, y, width, height, color);
}
void VolumeMeter::paintTicks(QPainter &painter, int x, int y, int width,
@ -767,15 +770,7 @@ void VolumeMeter::paintMeter(QPainter &painter, int x, int y, int width,
painter.fillRect(peakHoldPosition - 3, y, 3, height,
foregroundErrorColor);
if (magnitudePosition - 3 < minimumPosition)
;// Magnitude below minimum, no drawing.
else if (magnitudePosition < warningPosition)
painter.fillRect(magnitudePosition - 3, y, 3, height,
magnitudeColor);
else if (magnitudePosition < errorPosition)
painter.fillRect(magnitudePosition - 3, y, 3, height,
magnitudeColor);
else
if (magnitudePosition - 3 >= minimumPosition)
painter.fillRect(magnitudePosition - 3, y, 3, height,
magnitudeColor);
}