diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-06-29 20:20:34 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-06-29 20:21:09 +0200 |
commit | f92e8de4557430281cdb92711a57af9d6e7b13c4 (patch) | |
tree | 0758d5899aa9a4add0a93960a3a02c126984a42b /src/imports/controls/material | |
parent | 4c241ade2fba2dae76ece8cd7b176826c40fb86f (diff) | |
parent | 0af937e89dfc5a2446a980eae26e964adea8b2b3 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ifd118c11fd6034d03b98c961313280b7098c5f84
Diffstat (limited to 'src/imports/controls/material')
-rw-r--r-- | src/imports/controls/material/ComboBox.qml | 2 | ||||
-rw-r--r-- | src/imports/controls/material/Frame.qml | 2 | ||||
-rw-r--r-- | src/imports/controls/material/GroupBox.qml | 2 | ||||
-rw-r--r-- | src/imports/controls/material/Pane.qml | 2 | ||||
-rw-r--r-- | src/imports/controls/material/Popup.qml | 2 | ||||
-rw-r--r-- | 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 3861629b..b412e926 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -143,7 +143,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 c7a2935a..c2f623ae 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 48380414..6d84197c 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 6a02b25a..251492ea 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 04d15fa9..19fd6b79 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 8be0d432..3325f172 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") |