summaryrefslogtreecommitdiffstats
path: root/basicsuite
diff options
context:
space:
mode:
authorJuho Annunen <juho.annunen@qt.io>2018-04-17 14:04:55 +0300
committerJuho Annunen <juho.annunen@qt.io>2018-05-04 10:02:36 +0000
commit2e8942fe7661ba75da5c45d214d2efd6212910c8 (patch)
tree27a2d63da300c378a276acfb5752bd39b2db0a3d /basicsuite
parente365074240fe8ebc5b15c6ccc75cc969665fdd8d (diff)
Update GraphicalEffects demo to new UI theme
Task-number: QTBUG-62790 Change-Id: Ie4953d8ca1209ed382ad82f1db35c3b1a997dd1d Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'basicsuite')
-rw-r--r--basicsuite/graphicaleffects/main.qml33
1 files changed, 12 insertions, 21 deletions
diff --git a/basicsuite/graphicaleffects/main.qml b/basicsuite/graphicaleffects/main.qml
index 1b31a9d..a1ee5e8 100644
--- a/basicsuite/graphicaleffects/main.qml
+++ b/basicsuite/graphicaleffects/main.qml
@@ -73,7 +73,7 @@ Item {
anchors.right: checkers.left
anchors.top: parent.top
anchors.bottom: parent.bottom
- color: "black"
+ color: defaultBackground
}
ListModel {
@@ -102,8 +102,6 @@ Item {
clip: true
focus: true
- highlightMoveDuration: 0
-
onCurrentItemChanged: {
var entry = listModel.get(currentIndex);
loader.source = entry.file;
@@ -111,9 +109,7 @@ Item {
model: listModel
- highlight: Rectangle {
- color: "steelblue"
- }
+
delegate: Item {
id: delegateRoot
@@ -121,20 +117,13 @@ Item {
width: list.width
height: root.height * 0.05
- Rectangle {
- width: parent.width
- height: 3
- anchors.bottom: parent.bottom
- gradient: Gradient {
- GradientStop { position: 0; color: "transparent" }
- GradientStop { position: 0.5; color: "lightgray" }
- GradientStop { position: 1; color: "transparent" }
- }
- }
+ property bool isSelected: list.currentIndex == index
Text {
- color: "white"
- font.pixelSize: parent.height * 0.5
+ color: parent.isSelected ? defaultGreen : "white"
+ font.pixelSize: parent.height * 0.625
+ font.family: appFont
+ font.styleName: parent.isSelected ? "Bold" : "Regular"
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: -2
x: parent.width * 0.1
@@ -162,14 +151,14 @@ Item {
var h = canvas.height;
- ctx.fillStyle = "rgb(50, 50, 50)"
+ ctx.fillStyle = "rgb(58, 64, 85)"
ctx.beginPath();
ctx.roundedRect(0, 0, w, h, w * 0.1, w * 0.1);
ctx.fill();
var margin = canvas.padding;
var segmentSize = 4
- ctx.strokeStyle = "gray"
+ ctx.strokeStyle = defaultGrey
ctx.beginPath();
ctx.moveTo(margin, margin);
ctx.lineTo(margin, h-margin);
@@ -189,7 +178,7 @@ Item {
}
Rectangle {
- color: "red"
+ color: defaultGreen
width: parent.width / 20
height: width
radius: width / 2
@@ -208,6 +197,7 @@ Item {
color: "white"
font.pixelSize: canvas.padding * 0.5
+ font.family: appFont
}
Text {
@@ -222,6 +212,7 @@ Item {
+ (loader.item != undefined && typeof loader.item.feedbackY != 'undefined' ? ": " + loader.item.feedbackY.toFixed(2) : "");
color: "white"
font.pixelSize: canvas.padding * 0.5
+ font.family: appFont
}
MouseArea {