Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/templates/qquickrangeslider_p.h

Change-Id: Ibe8ec18a7e22080f69f316d0394af1d03517ce93

8 files changed, 32 insertions, 7 deletions

diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml
index d0b05b2c..4dc9bfc5 100644
--- a/src/imports/controls/material/Button.qml
+++ b/src/imports/controls/material/Button.qml
@@ -86,6 +86,14 @@ T.Button {
             }
         }
 
+        Rectangle {
+            width: parent.width
+            height: parent.height
+            radius: parent.radius
+            visible: control.activeFocus
+            color: control.Material.checkBoxUncheckedRippleColor
+        }
+
         layer.enabled: control.enabled
         layer.effect: DropShadow {
             verticalOffset: 1
diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml
index abaf571d..fd6ef256 100644
--- a/src/imports/controls/material/CheckBox.qml
+++ b/src/imports/controls/material/CheckBox.qml
@@ -86,7 +86,7 @@ T.CheckBox {
             height: width
             control: control
             colored: control.checked
-            opacity: control.pressed ? 1 : 0
+            opacity: control.pressed || control.activeFocus ? 1 : 0
         }
 
         // TODO: This needs to be transparent
diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml
index 5529c546..ef073370 100644
--- a/src/imports/controls/material/ComboBox.qml
+++ b/src/imports/controls/material/ComboBox.qml
@@ -102,6 +102,14 @@ T.ComboBox {
             opacity: !control.enabled ? 0.5 : 1.0
             source: "qrc:/qt-project.org/imports/Qt/labs/controls/material/images/drop-indicator.png"
         }
+
+        Rectangle {
+            width: parent.width
+            height: parent.height
+            radius: parent.radius
+            visible: control.activeFocus
+            color: control.Material.checkBoxUncheckedRippleColor
+        }
     }
     //! [background]
 
@@ -109,7 +117,7 @@ T.ComboBox {
     popup: T.Popup {
         y: control.height
         implicitWidth: control.width
-        implicitHeight: Math.min(396, listview.contentHeight)
+        implicitHeight: listview.contentHeight
         transformOrigin: Item.Top
         topMargin: 12
         bottomMargin: 12
diff --git a/src/imports/controls/material/RadioButton.qml b/src/imports/controls/material/RadioButton.qml
index 429e4f80..4c8831a5 100644
--- a/src/imports/controls/material/RadioButton.qml
+++ b/src/imports/controls/material/RadioButton.qml
@@ -71,7 +71,7 @@ T.RadioButton {
             height: width
             control: control
             colored: control.checked
-            opacity: control.pressed ? 1 : 0
+            opacity: control.pressed || control.activeFocus ? 1 : 0
         }
 
         Rectangle {
diff --git a/src/imports/controls/material/SliderHandle.qml b/src/imports/controls/material/SliderHandle.qml
index dc1a836d..6f54eaf5 100644
--- a/src/imports/controls/material/SliderHandle.qml
+++ b/src/imports/controls/material/SliderHandle.qml
@@ -55,7 +55,7 @@ Item {
         height: parent.height
         radius: width / 2
         color: root.control.Material.accentColor
-        scale: root.handlePressed || root.handleHasFocus ? 1.5 : 1
+        scale: root.handlePressed ? 1.5 : 1
 
         Behavior on scale {
             NumberAnimation {
@@ -63,4 +63,12 @@ Item {
             }
         }
     }
+
+    Ripple {
+        width: parent.width
+        height: width
+        control: root.control
+        colored: true
+        opacity: root.handleHasFocus && !root.handlePressed ? 1 : 0
+    }
 }
diff --git a/src/imports/controls/material/Switch.qml b/src/imports/controls/material/Switch.qml
index a38a643c..ca4b1ff6 100644
--- a/src/imports/controls/material/Switch.qml
+++ b/src/imports/controls/material/Switch.qml
@@ -67,7 +67,7 @@ T.Switch {
             height: width
             control: control
             colored: control.checked
-            opacity: control.pressed ? 1 : 0
+            opacity: control.pressed || control.activeFocus ? 1 : 0
         }
 
         Rectangle {
diff --git a/src/imports/controls/material/qquickmaterialprogressstrip.cpp b/src/imports/controls/material/qquickmaterialprogressstrip.cpp
index a3ff6c9b..34590340 100644
--- a/src/imports/controls/material/qquickmaterialprogressstrip.cpp
+++ b/src/imports/controls/material/qquickmaterialprogressstrip.cpp
@@ -225,6 +225,7 @@ QSGNode *QQuickMaterialProgressStrip::updatePaintNode(QSGNode *oldNode, UpdatePa
             transformNode->appendChildNode(rectNode);
         }
         Q_ASSERT(transformNode->type() == QSGNode::TransformNodeType);
+        static_cast<QSGTransformNode *>(transformNode)->setMatrix(QMatrix4x4());
 
         QSGRectangleNode *rectNode = static_cast<QSGRectangleNode *>(transformNode->firstChild());
         Q_ASSERT(rectNode->type() == QSGNode::GeometryNodeType);
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index 5100d01e..280acb77 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/imports/controls/material/qquickmaterialstyle.cpp
@@ -634,7 +634,7 @@ QColor QQuickMaterialStyle::accentColor() const
         return QColor::fromRgba(m_accent);
     if (m_accent > BlueGrey)
         return QColor();
-    return colors[m_accent][Shade500];
+    return colors[m_accent][m_theme == Light ? Shade500 : Shade200];
 }
 
 QColor QQuickMaterialStyle::backgroundColor() const
@@ -744,7 +744,7 @@ QColor QQuickMaterialStyle::checkBoxCheckedRippleColor() const
 {
     QColor pressColor = accentColor();
     // TODO: find out actual value
-    pressColor.setAlpha(30);
+    pressColor.setAlpha(m_theme == Light ? 30 : 50);
     return pressColor;
 }