aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2016-01-20 13:14:01 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2016-01-20 15:28:52 +0000
commit7479a85917f0daad7f66bec913a003541fc238d4 (patch)
treee523ada9fe46a1e6694a713863f2f33c467eaeee /src/imports
parent9b5ddc41471f37e1950a74821cda5d7be4056b74 (diff)
Default: add subtle fill color for buttons and alike
Change-Id: I287032a103046b23e1238152f8d527b3d02f23d1 Task-number: QTBUG-50327 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/controls/Button.qml2
-rw-r--r--src/imports/controls/CheckBox.qml2
-rw-r--r--src/imports/controls/RadioButton.qml2
-rw-r--r--src/imports/controls/Slider.qml2
-rw-r--r--src/imports/controls/SpinBox.qml4
-rw-r--r--src/imports/controls/Switch.qml2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index 1196f56b..290f4ce4 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/Button.qml
@@ -71,7 +71,7 @@ T.Button {
implicitWidth: 100
implicitHeight: 40
opacity: enabled ? 1 : 0.3
- color: control.pressed ? (control.highlighted ? "#585a5c" : "#e4e4e4") : (control.highlighted ? "#353637" : "#ffffff")
+ color: control.pressed ? (control.highlighted ? "#585a5c" : "#e4e4e4") : (control.highlighted ? "#353637" : "#f6f6f6")
border.color: control.pressed ? "#26282a" : "#353637"
}
//! [background]
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml
index b7d67fe6..20d8ef1c 100644
--- a/src/imports/controls/CheckBox.qml
+++ b/src/imports/controls/CheckBox.qml
@@ -60,7 +60,7 @@ T.CheckBox {
x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
y: control.topPadding + (control.availableHeight - height) / 2
- color: control.enabled ? (control.pressed ? "#e4e4e4" : "#ffffff") : "#353637"
+ color: control.enabled ? (control.pressed ? "#e4e4e4" : "#f6f6f6") : "#353637"
border.color: control.enabled ? (control.pressed ? "#26282a" : "#353637") : "transparent"
Image {
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml
index 82d74b88..8e1e0bce 100644
--- a/src/imports/controls/RadioButton.qml
+++ b/src/imports/controls/RadioButton.qml
@@ -64,7 +64,7 @@ T.RadioButton {
radius: width / 2
border.width: 1
border.color: (control.pressed ? "#26282a" : "#353637")
- color: control.pressed ? "#e4e4e4" : "#ffffff"
+ color: control.pressed ? "#e4e4e4" : "#f6f6f6"
Rectangle {
x: (parent.width - width) / 2
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml
index 250dbd3a..95cfc54e 100644
--- a/src/imports/controls/Slider.qml
+++ b/src/imports/controls/Slider.qml
@@ -57,7 +57,7 @@ T.Slider {
implicitHeight: 28
radius: width / 2
border.color: "#353637"
- color: control.pressed ? "#bdbebf" : "#ffffff"
+ color: control.pressed ? "#bdbebf" : "#f6f6f6"
readonly property bool horizontal: control.orientation === Qt.Horizontal
}
diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml
index 4b42a839..c84a2e3e 100644
--- a/src/imports/controls/SpinBox.qml
+++ b/src/imports/controls/SpinBox.qml
@@ -84,7 +84,7 @@ T.SpinBox {
x: control.mirrored ? 0 : parent.width - width
implicitWidth: 40
implicitHeight: 40
- color: up.pressed ? "#e4e4e4" : "#ffffff"
+ color: up.pressed ? "#e4e4e4" : "#f6f6f6"
border.color: control.enabled ? "#353637" : "#bdbebf"
Rectangle {
@@ -109,7 +109,7 @@ T.SpinBox {
x: control.mirrored ? parent.width - width : 0
implicitWidth: 40
implicitHeight: 40
- color: down.pressed ? "#e4e4e4" : "#ffffff"
+ color: down.pressed ? "#e4e4e4" : "#f6f6f6"
border.color: control.enabled ? "#353637" : "#bdbebf"
Rectangle {
diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml
index e1627d32..51348e77 100644
--- a/src/imports/controls/Switch.qml
+++ b/src/imports/controls/Switch.qml
@@ -75,7 +75,7 @@ T.Switch {
width: 28
height: 28
radius: 16
- color: control.pressed ? "#e4e4e4" : "#ffffff"
+ color: control.pressed ? "#e4e4e4" : "#f6f6f6"
border.width: 1
border.color: control.pressed ? "#26282a" : "#353637"