aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2011-08-11 20:05:19 +1000
committerQt by Nokia <qt-info@nokia.com>2011-08-15 06:48:30 +0200
commit8eb8a46b11a991223690d3ced86a827945f7098b (patch)
tree0758e033bb3fc477c09e1aa39d36809e28381954 /examples
parent576f769d82782f5321ff81ceb9458a2c38d83bf2 (diff)
Tweak particle examples
Some of them weren't scaling well when in the examples launcher. Change-Id: Ib6049fb5b3c9a99775008ae9072750c2424ad6ed Reviewed-on: http://codereview.qt.nokia.com/2857 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/particles/allsmiles/ultraparticles.qml2
-rw-r--r--examples/declarative/particles/modelparticles/gridsplosion.qml2
-rw-r--r--examples/declarative/particles/trails/turbulence.qml4
3 files changed, 4 insertions, 4 deletions
diff --git a/examples/declarative/particles/allsmiles/ultraparticles.qml b/examples/declarative/particles/allsmiles/ultraparticles.qml
index 0ea095deb6..eda1c8f859 100644
--- a/examples/declarative/particles/allsmiles/ultraparticles.qml
+++ b/examples/declarative/particles/allsmiles/ultraparticles.qml
@@ -104,6 +104,6 @@ Rectangle{
anchors.margins: 16
text: "... can you be trusted with the power?"
style: Text.Outline; styleColor: "#AAAAAA"
- font.pixelSize: 32
+ font.pixelSize: width > 400 ? 32 : 16
}
}
diff --git a/examples/declarative/particles/modelparticles/gridsplosion.qml b/examples/declarative/particles/modelparticles/gridsplosion.qml
index db860125e5..9232eb426d 100644
--- a/examples/declarative/particles/modelparticles/gridsplosion.qml
+++ b/examples/declarative/particles/modelparticles/gridsplosion.qml
@@ -42,7 +42,7 @@ import QtQuick 2.0
import QtQuick.Particles 2.0
import "content"
-Item{
+Rectangle{
id: root
width: 240
height: 240
diff --git a/examples/declarative/particles/trails/turbulence.qml b/examples/declarative/particles/trails/turbulence.qml
index 6159b3e9c9..3f822c7889 100644
--- a/examples/declarative/particles/trails/turbulence.qml
+++ b/examples/declarative/particles/trails/turbulence.qml
@@ -43,7 +43,7 @@ import QtQuick.Particles 2.0
Rectangle{
width: 360
- height: 540
+ height: 600
color: "#222222"
id: root
Image{
@@ -96,7 +96,7 @@ Rectangle{
FollowEmitter{
id: smoke1
width: root.width
- height: 232
+ height: 258
system: ps
particle: "smoke"
follow: "flame"