aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@theqtcompany.com>2015-09-30 14:16:15 +0200
committerMitch Curtis <mitch.curtis@theqtcompany.com>2015-10-01 12:52:30 +0000
commita53f0779012c08cdac134e95e0d83945ae5a6a1d (patch)
tree3c5baab424bf9133be786f15a4fef4e9262cb2b4 /examples
parent6caad87897ecf2a84dfa13bc913bddc270e4f6c9 (diff)
Update virtualkeyboard example colors for World Summit demo
Using the colors provided by Diana. Change-Id: I5948b68af0f6d3b8a33a95847ed92cc3b6920a9f Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Diffstat (limited to 'examples')
-rw-r--r--examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml4
-rw-r--r--examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml4
-rw-r--r--examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml6
-rw-r--r--examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml6
4 files changed, 10 insertions, 10 deletions
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml
index 3d82b54c..dcf81a07 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml
+++ b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml
@@ -23,7 +23,7 @@ import "content"
Rectangle {
width: 1280
height: 720
- color: "#999"
+ color: "#F6F6F6"
Flickable {
id: flickable
@@ -52,7 +52,7 @@ Rectangle {
width: parent.width - 26
Text {
- color: "#EEEEEE"
+ color: "#565758"
text: "Tap fields to enter text"
anchors.horizontalCenter: parent.horizontalCenter
font.pixelSize: 22
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml
index 5c3ad9d8..6906b86d 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml
+++ b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml
@@ -36,7 +36,7 @@ TextBase {
x: 8
y: (index+1)*editor.cursorRectangle.height+6
height: 1; width: textArea.width-24
- color: Qt.rgba(1.0, 1.0, 1.0, 0.5)
+ color: "#D6D6D6"
}
}
TextEdit {
@@ -48,7 +48,7 @@ TextBase {
y: 6
focus: true
- color: "#EEEEEE"
+ color: "#2B2C2E"
wrapMode: TextEdit.Wrap
cursorVisible: activeFocus
height: Math.max(implicitHeight, 60)
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml
index 19c89ce5..5a26ce5a 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml
+++ b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml
@@ -44,14 +44,14 @@ FocusScope {
// background
radius: 5.0
anchors.fill: parent
- color: Qt.rgba(1.0, 1.0, 1.0, 0.2)
- border { width: editor.activeFocus ? 2 : 0; color: "#CCCCCC" }
+ color: "#FFFFFF"
+ border { width: 1; color: editor.activeFocus ? "#5CAA15" : "#BDBEBF" }
}
Text {
id: previewText
y: 8
- color: "#CCCCCC"
+ color: "#a0a1a2"
visible: previewTextActive
text: textBase.previewText
font.pixelSize: 28
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml
index 97dc8067..6f58aa24 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml
+++ b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml
@@ -55,12 +55,12 @@ TextBase {
y: 6
focus: true
- color: "#EEEEEE"
+ color: "#2B2C2E"
cursorVisible: activeFocus
passwordCharacter: "\u2022"
font.pixelSize: textField.fontPixelSize
- selectionColor: Qt.rgba(1.0, 1.0, 1.0, 0.5)
- selectedTextColor: Qt.rgba(0.0, 0.0, 0.0, 0.8)
+ selectionColor: Qt.rgba(0.0, 0.0, 0.0, 0.15)
+ selectedTextColor: color
width: Math.max(flickable.width, implicitWidth)-2
onActiveFocusChanged: if (!activeFocus) deselect()