From e86400fa6e0e2b2de2fa5b41bafa272e60883db8 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Fri, 24 Jun 2016 21:03:50 +0200
Subject: [PATCH 1/2] Material: fix radius

There's barely any visual difference, but follow the Material Design specs
that use 2dp corner radius.

Change-Id: I9f1462eeb89c2462abb07a76949710d11881c4ce
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/imports/controls/material/ComboBox.qml | 2 +-
 src/imports/controls/material/Frame.qml    | 2 +-
 src/imports/controls/material/GroupBox.qml | 2 +-
 src/imports/controls/material/Pane.qml     | 2 +-
 src/imports/controls/material/Popup.qml    | 2 +-
 src/imports/controls/material/SpinBox.qml  | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml
index acbdf9c00a..41ebedac95 100644
--- a/src/imports/controls/material/ComboBox.qml
+++ b/src/imports/controls/material/ComboBox.qml
@@ -142,7 +142,7 @@ T.ComboBox {
         }
 
         background: Rectangle {
-            radius: 3
+            radius: 2
             color: control.Material.dialogColor
 
             layer.enabled: control.enabled
diff --git a/src/imports/controls/material/Frame.qml b/src/imports/controls/material/Frame.qml
index c7a2935a1c..c2f623ae04 100644
--- a/src/imports/controls/material/Frame.qml
+++ b/src/imports/controls/material/Frame.qml
@@ -53,7 +53,7 @@ T.Frame {
     contentItem: Item { }
 
     background: Rectangle {
-        radius: 3
+        radius: 2
         color: control.Material.elevation > 0 ? control.Material.backgroundColor : "transparent"
         border.color: control.Material.frameColor
 
diff --git a/src/imports/controls/material/GroupBox.qml b/src/imports/controls/material/GroupBox.qml
index 4838041463..6d84197c61 100644
--- a/src/imports/controls/material/GroupBox.qml
+++ b/src/imports/controls/material/GroupBox.qml
@@ -73,7 +73,7 @@ T.GroupBox {
         width: parent.width
         height: parent.height - control.topPadding + control.padding
 
-        radius: 3
+        radius: 2
         color: control.Material.elevation > 0 ? control.Material.backgroundColor : "transparent"
         border.color: control.Material.frameColor
 
diff --git a/src/imports/controls/material/Pane.qml b/src/imports/controls/material/Pane.qml
index 6a02b25a2d..251492eae2 100644
--- a/src/imports/controls/material/Pane.qml
+++ b/src/imports/controls/material/Pane.qml
@@ -54,7 +54,7 @@ T.Pane {
 
     background: Rectangle {
         color: control.Material.backgroundColor
-        radius: control.Material.elevation > 0 ? 3 : 0
+        radius: control.Material.elevation > 0 ? 2 : 0
 
         layer.enabled: control.enabled && control.Material.elevation > 0
         layer.effect: ElevationEffect {
diff --git a/src/imports/controls/material/Popup.qml b/src/imports/controls/material/Popup.qml
index 04d15fa9ba..19fd6b795d 100644
--- a/src/imports/controls/material/Popup.qml
+++ b/src/imports/controls/material/Popup.qml
@@ -69,7 +69,7 @@ T.Popup {
     contentItem: Item { }
 
     background: Rectangle {
-        radius: 3
+        radius: 2
         color: control.Material.dialogColor
 
         layer.enabled: control.Material.elevation > 0
diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml
index 8be0d432b3..3325f172be 100644
--- a/src/imports/controls/material/SpinBox.qml
+++ b/src/imports/controls/material/SpinBox.qml
@@ -111,7 +111,7 @@ T.SpinBox {
         height: parent.height
         width: height
         padding: control.spacing
-        radius: 3
+        radius: 2
         color: Qt.tint(Qt.tint(control.Material.buttonColor,
                                control.activeFocus ? control.Material.buttonHoverColor : "transparent"),
                                control.up.pressed ? control.Material.buttonPressColor: "transparent")
@@ -139,7 +139,7 @@ T.SpinBox {
         height: parent.height
         width: height
         padding: control.spacing
-        radius: 3
+        radius: 2
         color: Qt.tint(Qt.tint(control.Material.buttonColor,
                                control.activeFocus ? control.Material.buttonHoverColor : "transparent"),
                                control.down.pressed ? control.Material.buttonPressColor : "transparent")

From 0af937e89dfc5a2446a980eae26e964adea8b2b3 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Wed, 29 Jun 2016 10:37:52 +0200
Subject: [PATCH 2/2] Universal: fix Dial press effect

It doesn't have a 'down' property like buttons do.

Change-Id: I3b6eb0d0d302914888eccdd76fda886b78a30465
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/imports/controls/universal/Dial.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/imports/controls/universal/Dial.qml b/src/imports/controls/universal/Dial.qml
index 56cc708016..6781d38752 100644
--- a/src/imports/controls/universal/Dial.qml
+++ b/src/imports/controls/universal/Dial.qml
@@ -64,7 +64,7 @@ T.Dial {
 
         radius: width / 2
         color: !control.enabled ? control.Universal.baseLowColor :
-                control.down ? control.Universal.baseMediumColor : control.Universal.baseMediumHighColor
+                control.pressed ? control.Universal.baseMediumColor : control.Universal.baseMediumHighColor
 
         transform: [
             Translate {