qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Change-Id: Ifd118c11fd6034d03b98c961313280b7098c5f84
This commit is contained in:
J-P Nurmi 2016-06-29 20:20:34 +02:00
parent 4c241ade2f 0af937e89d
commit f92e8de455
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/imports/controls/material/ComboBox.qml
View File

@ -143,7 +143,7 @@ T.ComboBox {
}
background: Rectangle {
radius: 3
radius: 2
color: control.Material.dialogColor
layer.enabled: control.enabled

2
src/imports/controls/material/Frame.qml
View File

@ -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

2
src/imports/controls/material/GroupBox.qml
View File

@ -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

2
src/imports/controls/material/Pane.qml
View File

@ -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 {

2
src/imports/controls/material/Popup.qml
View File

@ -69,7 +69,7 @@ T.Popup {
contentItem: Item { }
background: Rectangle {
radius: 3
radius: 2
color: control.Material.dialogColor
layer.enabled: control.Material.elevation > 0

4
src/imports/controls/material/SpinBox.qml
View File

@ -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")

2
src/imports/controls/universal/Dial.qml
View File

@ -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 {