Merge remote-tracking branch 'upstream/master' into lp1850644

13 files changed, 21 insertions, 13 deletions

diff --git a/src/widget/weffectparameterknob.cpp b/src/widget/weffectparameterknob.cpp
index aafd7a6c21..087f819115 100644
--- a/src/widget/weffectparameterknob.cpp
+++ b/src/widget/weffectparameterknob.cpp
@@ -10,6 +10,7 @@ void WEffectParameterKnob::setupEffectParameterSlot(const ConfigKey& configKey)
         return;
     }
     setEffectParameterSlot(pParameterSlot);
+    setFocusPolicy(Qt::NoFocus);
 }
 
 void WEffectParameterKnob::setEffectParameterSlot(
diff --git a/src/widget/weffectparameterknobcomposed.cpp b/src/widget/weffectparameterknobcomposed.cpp
index 92be02f01e..f4d03a6226 100644
--- a/src/widget/weffectparameterknobcomposed.cpp
+++ b/src/widget/weffectparameterknobcomposed.cpp
@@ -15,6 +15,7 @@ void WEffectParameterKnobComposed::setupEffectParameterSlot(const ConfigKey& con
         return;
     }
     setEffectParameterSlot(pParameterSlot);
+    setFocusPolicy(Qt::NoFocus);
 }
 
 void WEffectParameterKnobComposed::setEffectParameterSlot(
diff --git a/src/widget/weffectpushbutton.cpp b/src/widget/weffectpushbutton.cpp
index 5ef08375a2..540be261a1 100644
--- a/src/widget/weffectpushbutton.cpp
+++ b/src/widget/weffectpushbutton.cpp
@@ -17,6 +17,7 @@ void WEffectPushButton::setup(const QDomNode& node, const SkinContext& context)
     m_pButtonMenu = new QMenu(this);
     connect(m_pButtonMenu, SIGNAL(triggered(QAction*)),
             this, SLOT(slotActionChosen(QAction*)));
+    setFocusPolicy(Qt::NoFocus);
 }
 
 void WEffectPushButton::setupEffectParameterSlot(const ConfigKey& configKey) {
diff --git a/src/widget/wknob.cpp b/src/widget/wknob.cpp
index 04e9a57813..80395ab5c9 100644
--- a/src/widget/wknob.cpp
+++ b/src/widget/wknob.cpp
@@ -28,6 +28,7 @@ WKnob::WKnob(QWidget* pParent)
                         mixxx::Duration::fromSeconds(1)) {
     connect(&m_renderTimer, SIGNAL(update()),
             this, SLOT(update()));
+    setFocusPolicy(Qt::NoFocus);
 }
 
 void WKnob::mouseMoveEvent(QMouseEvent* e) {
diff --git a/src/widget/wknobcomposed.cpp b/src/widget/wknobcomposed.cpp
index 1e4621ab4c..49269173d1 100644
--- a/src/widget/wknobcomposed.cpp
+++ b/src/widget/wknobcomposed.cpp
@@ -56,6 +56,8 @@ void WKnobComposed::setup(const QDomNode& node, const SkinContext& context) {
     m_dKnobCenterXOffset *= scaleFactor;
     m_dKnobCenterYOffset *= scaleFactor;
     m_dArcThickness *= scaleFactor;
+
+    setFocusPolicy(Qt::NoFocus);
 }
 
 void WKnobComposed::clear() {
diff --git a/src/widget/wnumberrate.cpp b/src/widget/wnumberrate.cpp
index 84dd888c34..17f53ce5df 100644
--- a/src/widget/wnumberrate.cpp
+++ b/src/widget/wnumberrate.cpp
@@ -18,20 +18,14 @@
 
 WNumberRate::WNumberRate(const char * group, QWidget * parent)
         : WNumber(parent) {
-    m_pRateRangeControl = new ControlProxy(group, "rateRange", this);
-    m_pRateRangeControl->connectValueChanged(this, &WNumberRate::setValue);
-    m_pRateDirControl = new ControlProxy(group, "rate_dir", this);
-    m_pRateDirControl->connectValueChanged(this, &WNumberRate::setValue);
-    m_pRateControl = new ControlProxy(group, "rate", this);
-    m_pRateControl->connectValueChanged(this, &WNumberRate::setValue);
+    m_pRateRatio = new ControlProxy(group, "rate_ratio", this);
+    m_pRateRatio->connectValueChanged(this, &WNumberRate::setValue);
     // Initialize the widget.
     setValue(0);
 }
 
 void WNumberRate::setValue(double /*dValue*/) {
-    double vsign = m_pRateControl->get() *
-            m_pRateRangeControl->get() *
-            m_pRateDirControl->get();
+    double vsign = m_pRateRatio->get() - 1;
 
     char sign = '+';
     if (vsign < -0.00000001) {
diff --git a/src/widget/wnumberrate.h b/src/widget/wnumberrate.h
index fdf213b2ab..676bf85985 100644
--- a/src/widget/wnumberrate.h
+++ b/src/widget/wnumberrate.h
@@ -25,10 +25,7 @@ class WNumberRate final : public WNumber {
     void setValue(double dValue) override;
 
   private:
-    // Pointer to control objects for rate.
-    ControlProxy* m_pRateControl;
-    ControlProxy* m_pRateRangeControl;
-    ControlProxy* m_pRateDirControl;
+    ControlProxy* m_pRateRatio;
 };
 
 #endif
diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp
index 712fdbb16d..792ba94447 100644
--- a/src/widget/woverview.cpp
+++ b/src/widget/woverview.cpp
@@ -198,6 +198,8 @@ void WOverview::setup(const QDomNode& node, const SkinContext& context) {
             }
         }
     }
+
+    setFocusPolicy(Qt::NoFocus);
 }
 
 void WOverview::onConnectedControlChanged(double dParameter, double dValue) {
diff --git a/src/widget/wpushbutton.cpp b/src/widget/wpushbutton.cpp
index 2a41ffecf2..f3dc58a25e 100644
--- a/src/widget/wpushbutton.cpp
+++ b/src/widget/wpushbutton.cpp
@@ -222,6 +222,8 @@ void WPushButton::setup(const QDomNode& node, const SkinContext& context) {
             rightConnection->setDirectionOption(ControlParameterWidgetConnection::DIR_FROM_WIDGET);
         }
     }
+
+    setFocusPolicy(Qt::NoFocus);
 }
 
 void WPushButton::setStates(int iStates) {
diff --git a/src/widget/wslidercomposed.cpp b/src/widget/wslidercomposed.cpp
index db63e0b280..8adeae227a 100644
--- a/src/widget/wslidercomposed.cpp
+++ b/src/widget/wslidercomposed.cpp
@@ -89,6 +89,8 @@ void WSliderComposed::setup(const QDomNode& node, const SkinContext& context) {
             }
         }
     }
+
+    setFocusPolicy(Qt::NoFocus);
 }
 
 void WSliderComposed::setSliderPixmap(PixmapSource sourceSlider,
diff --git a/src/widget/wstarrating.cpp b/src/widget/wstarrating.cpp
index b4ad62f809..896b014c18 100644
--- a/src/widget/wstarrating.cpp
+++ b/src/widget/wstarrating.cpp
@@ -21,6 +21,7 @@ void WStarRating::setup(const QDomNode& node, const SkinContext& context) {
     Q_UNUSED(node);
     Q_UNUSED(context);
     setMouseTracking(true);
+    setFocusPolicy(Qt::NoFocus);
 }
 
 QSize WStarRating::sizeHint() const {
diff --git a/src/widget/wstatuslight.cpp b/src/widget/wstatuslight.cpp
index cdecfe73f9..48d7b4baba 100644
--- a/src/widget/wstatuslight.cpp
+++ b/src/widget/wstatuslight.cpp
@@ -66,6 +66,8 @@ void WStatusLight::setup(const QDomNode& node, const SkinContext& context) {
             m_pixmaps[i].clear();
         }
     }
+
+    setFocusPolicy(Qt::NoFocus);
 }
 
 void WStatusLight::setPixmap(int iState, PixmapSource source,
diff --git a/src/widget/wvumeter.cpp b/src/widget/wvumeter.cpp
index dc23b2f161..2f8bf642c3 100644
--- a/src/widget/wvumeter.cpp
+++ b/src/widget/wvumeter.cpp
@@ -90,6 +90,8 @@ void WVuMeter::setup(const QDomNode& node, const SkinContext& context) {
     if (m_iPeakFallTime < 1 || m_iPeakFallTime > 1000) {
         m_iPeakFallTime = DEFAULT_FALLTIME;
     }
+
+    setFocusPolicy(Qt::NoFocus);
 }
 
 void WVuMeter::setPixmapBackground(