summaryrefslogtreecommitdiffstats
path: root/src/widget
diff options
context:
space:
mode:
authorOwen Williams <owilliams@mixxx.org>2014-01-12 11:45:27 -0500
committerOwen Williams <owilliams@mixxx.org>2014-01-14 16:14:01 -0500
commit905a0960502b690eca89893e839759ffcb87c536 (patch)
tree3ebc005679d124c99bbc6cacc704e83e7e76a309 /src/widget
parenta5dc004e78a0a223df02e531df7e5f6c390f4bdf (diff)
Have WNumbers the NumberOfDigits parameter and set a default of 1 decimal.
Diffstat (limited to 'src/widget')
-rw-r--r--src/widget/wnumber.cpp12
-rw-r--r--src/widget/wnumberrate.cpp2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/widget/wnumber.cpp b/src/widget/wnumber.cpp
index 9e598857b0..4117422124 100644
--- a/src/widget/wnumber.cpp
+++ b/src/widget/wnumber.cpp
@@ -24,7 +24,7 @@
WNumber::WNumber(QWidget* pParent)
: WLabel(pParent),
- m_iNoDigits(-1),
+ m_iNoDigits(1),
m_dConstFactor(0.0) {
}
@@ -34,10 +34,10 @@ WNumber::~WNumber() {
void WNumber::setup(QDomNode node, const SkinContext& context) {
WLabel::setup(node, context);
- // Number of digits
- // TODO(rryan): This has been unused for a long time yet our skins specify
- // this value all over the place.
- m_iNoDigits = context.selectInt(node, "NumberOfDigits");
+ // Number of digits after the decimal.
+ if (context.hasNode(node, "NumberOfDigits")) {
+ m_iNoDigits = context.selectInt(node, "NumberOfDigits");
+ }
// Constant factor
if (context.hasNode(node, "ConstFactor")) {
@@ -54,5 +54,5 @@ void WNumber::onConnectedControlValueChanged(double v) {
void WNumber::setValue(double dValue) {
double v = dValue + m_dConstFactor;
- setText(QString(m_qsText).append(QString::number(v, 'f', 1)));
+ setText(QString(m_qsText).append(QString::number(v, 'f', m_iNoDigits)));
}
diff --git a/src/widget/wnumberrate.cpp b/src/widget/wnumberrate.cpp
index 2844a784b0..ed1aac5e69 100644
--- a/src/widget/wnumberrate.cpp
+++ b/src/widget/wnumberrate.cpp
@@ -49,5 +49,5 @@ void WNumberRate::setValue(double) {
}
setText(QString(m_qsText).append(sign)
- .append("%1").arg(fabs(vsign)*100., 0, 'f', 1));
+ .append("%1").arg(fabs(vsign)*100., 0, 'f', m_iNoDigits));
}