diff options
author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2013-05-02 18:18:08 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-08 21:42:37 +0200 |
commit | 2416927b67dcb4021edd38231295c13fe1b5a580 (patch) | |
tree | f7d31bc4c1640d867ef59c4109766c3cc0a336a6 /examples/quick/controls/touch | |
parent | 2ae89b14d8dcc7176af3d475b38d3c023a1897a2 (diff) | |
download | qtquickcontrols-2416927b67dcb4021edd38231295c13fe1b5a580.tar.gz |
Refactor and clean up public style API
Change-Id: I10271c860abd9b45a262e3548628e6a3026e1a4f
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'examples/quick/controls/touch')
6 files changed, 13 insertions, 11 deletions
diff --git a/examples/quick/controls/touch/content/ButtonPage.qml b/examples/quick/controls/touch/content/ButtonPage.qml index cc5925ce..635ce3b9 100644 --- a/examples/quick/controls/touch/content/ButtonPage.qml +++ b/examples/quick/controls/touch/content/ButtonPage.qml @@ -94,7 +94,7 @@ Item { Component { id: touchStyle ButtonStyle { - background: Item { + panel: Item { implicitHeight: 50 implicitWidth: 320 BorderImage { @@ -106,10 +106,15 @@ Item { border.right: 8 anchors.margins: control.pressed ? -4 : 0 source: control.pressed ? "../images/button_pressed.png" : "../images/button_default.png" + Text { + text: control.text + anchors.centerIn: parent + color: "white" + font.pixelSize: 23 + renderType: Text.NativeRendering + } } } - foregroundColor: "white" - font.pixelSize: 23 } } } diff --git a/examples/quick/controls/touch/content/ProgressBarPage.qml b/examples/quick/controls/touch/content/ProgressBarPage.qml index 86a46b69..dc0f5521 100644 --- a/examples/quick/controls/touch/content/ProgressBarPage.qml +++ b/examples/quick/controls/touch/content/ProgressBarPage.qml @@ -96,7 +96,7 @@ Item { Component { id: touchStyle ProgressBarStyle { - background: Rectangle { + panel: Rectangle { implicitHeight: 15 implicitWidth: 400 color: "#444" diff --git a/examples/quick/controls/touch/content/SliderPage.qml b/examples/quick/controls/touch/content/SliderPage.qml index 8d9ff0b1..8eb91902 100644 --- a/examples/quick/controls/touch/content/SliderPage.qml +++ b/examples/quick/controls/touch/content/SliderPage.qml @@ -83,7 +83,7 @@ Item { color: Qt.lighter("#468bb7", 1.2) } - background: Item { + groove: Item { implicitHeight: 50 implicitWidth: 400 Rectangle { diff --git a/examples/quick/controls/touch/content/TabBarPage.qml b/examples/quick/controls/touch/content/TabBarPage.qml index 41de7822..c96314be 100644 --- a/examples/quick/controls/touch/content/TabBarPage.qml +++ b/examples/quick/controls/touch/content/TabBarPage.qml @@ -70,7 +70,8 @@ Item { Component { id: touchStyle TabViewStyle { - tabBarAlignment: "center" + tabsAlignment: Qt.AlignVCenter + tabOverlap: 0 frame: Item { } tab: Item { implicitWidth: control.width/control.count diff --git a/examples/quick/controls/touch/content/TextInputPage.qml b/examples/quick/controls/touch/content/TextInputPage.qml index 3f408d47..605afef2 100644 --- a/examples/quick/controls/touch/content/TextInputPage.qml +++ b/examples/quick/controls/touch/content/TextInputPage.qml @@ -87,7 +87,7 @@ Item { id: touchStyle TextFieldStyle { - foregroundColor: "white" + textColor: "white" font.pixelSize: 28 background: Item { implicitHeight: 50 diff --git a/examples/quick/controls/touch/main.qml b/examples/quick/controls/touch/main.qml index 342d4f2d..3058a0d3 100644 --- a/examples/quick/controls/touch/main.qml +++ b/examples/quick/controls/touch/main.qml @@ -38,10 +38,6 @@ ** ****************************************************************************/ - - - - import QtQuick 2.1 import QtQuick.Controls 1.0 import "content" |