From: Alan Alpert <alan.alpert@nokia.com>
Date: Thu, 11 Aug 2011 10:05:19 +0000 (+1000)
Subject: Tweak particle examples
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=8eb8a46b11a991223690d3ced86a827945f7098b;p=konrad%2Fqtdeclarative.git

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>
---

diff --git a/examples/declarative/particles/allsmiles/ultraparticles.qml b/examples/declarative/particles/allsmiles/ultraparticles.qml
index 0ea095d..eda1c8f 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 db86012..9232eb4 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 6159b3e..3f822c7 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"