Refactor canvas examples by following the new example guidelines.

Change-Id: I1cc749ad11b8439239ba739f40e99b78af7351ab
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>

diff --git a/examples/quick/canvas/stockchart/README b/examples/demos/stockchart/README
similarity index 100%
rename from examples/quick/canvas/stockchart/README
rename to examples/demos/stockchart/README

diff --git a/examples/quick/canvas/stockchart/com/nokia/StockChartExample/qmldir b/examples/demos/stockchart/com/nokia/StockChartExample/qmldir
similarity index 100%
rename from examples/quick/canvas/stockchart/com/nokia/StockChartExample/qmldir
rename to examples/demos/stockchart/com/nokia/StockChartExample/qmldir

diff --git a/examples/quick/canvas/stockchart/model.cpp b/examples/demos/stockchart/model.cpp
similarity index 100%
rename from examples/quick/canvas/stockchart/model.cpp
rename to examples/demos/stockchart/model.cpp

diff --git a/examples/quick/canvas/stockchart/model.h b/examples/demos/stockchart/model.h
similarity index 100%
rename from examples/quick/canvas/stockchart/model.h
rename to examples/demos/stockchart/model.h

diff --git a/examples/quick/canvas/stockchart/plugin.cpp b/examples/demos/stockchart/plugin.cpp
similarity index 100%
rename from examples/quick/canvas/stockchart/plugin.cpp
rename to examples/demos/stockchart/plugin.cpp

diff --git a/examples/quick/canvas/stockchart/stock.qml b/examples/demos/stockchart/stock.qml
similarity index 100%
rename from examples/quick/canvas/stockchart/stock.qml
rename to examples/demos/stockchart/stock.qml

diff --git a/examples/quick/canvas/stockchart/stockchart.pro b/examples/demos/stockchart/stockchart.pro
similarity index 100%
rename from examples/quick/canvas/stockchart/stockchart.pro
rename to examples/demos/stockchart/stockchart.pro

diff --git a/examples/demos/stockchart/stockchart.qmlproject b/examples/demos/stockchart/stockchart.qmlproject
new file mode 100644 (file)
index 0000000..5f2b909
--- /dev/null
+++ b/examples/demos/stockchart/stockchart.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.1
+
+Project {
+    mainFile: "stock.qml"
+
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+}
\ No newline at end of file

diff --git a/examples/quick/canvas/twitterfriends/TwitterUser.qml b/examples/demos/twitterfriends/TwitterUser.qml
similarity index 100%
rename from examples/quick/canvas/twitterfriends/TwitterUser.qml
rename to examples/demos/twitterfriends/TwitterUser.qml

diff --git a/examples/quick/canvas/twitterfriends/cache.js b/examples/demos/twitterfriends/cache.js
similarity index 100%
rename from examples/quick/canvas/twitterfriends/cache.js
rename to examples/demos/twitterfriends/cache.js

diff --git a/examples/quick/canvas/twitterfriends/twitter.qml b/examples/demos/twitterfriends/friends.qml
similarity index 99%
rename from examples/quick/canvas/twitterfriends/twitter.qml
rename to examples/demos/twitterfriends/friends.qml
index 9dc2bcc..841b8bd 100644 (file)
--- a/examples/quick/canvas/twitterfriends/twitter.qml
+++ b/examples/demos/twitterfriends/friends.qml
@@ -39,7 +39,6 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../contents"
 import "cache.js" as TwitterUserCache
 Rectangle {
     width:360

diff --git a/examples/demos/twitterfriends/twitterfriends.qmlproject b/examples/demos/twitterfriends/twitterfriends.qmlproject
new file mode 100644 (file)
index 0000000..e841dee
--- /dev/null
+++ b/examples/demos/twitterfriends/twitterfriends.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.1
+
+Project {
+    mainFile: "friends.qml"
+
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+}
\ No newline at end of file

diff --git a/examples/quick/canvas/bezierCurve/bezierCurve.qml b/examples/quick/canvas/bezierCurve/bezierCurve.qml
index f57839b..4fb0fa8 100644 (file)
--- a/examples/quick/canvas/bezierCurve/bezierCurve.qml
+++ b/examples/quick/canvas/bezierCurve/bezierCurve.qml
@@ -42,18 +42,18 @@ import QtQuick 2.0
 import "../contents"
 Item {
   id:container
-  width:360
-  height:600
+  width:320
+  height:480
 
   Column {
     spacing:5
     anchors.fill:parent
-    Text { font.pointSize:25; text:"Bezier Curve"; anchors.horizontalCenter:parent.horizontalCenter}
+    Text { font.pointSize:15; text:"Bezier Curve"; anchors.horizontalCenter:parent.horizontalCenter}
 
     Canvas {
       id:canvas
-      width:360
-      height:360
+      width:320
+      height:280
       property string strokeStyle:"red"
       property string fillStyle:"red"
       property int lineWidth:lineWidthCtrl.value
@@ -109,15 +109,15 @@ Item {
 
     Rectangle {
         id:controls
-        width:360
-        height:160
+        width:320
+        height:150
         Column {
           spacing:3
-          Slider {id:lineWidthCtrl; width:300; height:30; min:1; max:10; init:2; name:"Line width"}
-          Slider {id:scaleXCtrl; width:300; height:30; min:0.1; max:10; init:1; name:"ScaleX"}
-          Slider {id:scaleYCtrl; width:300; height:30; min:0.1; max:10; init:1; name:"ScaleY"}
-          Slider {id:rotateCtrl; width:300; height:30; min:0; max:Math.PI*2; init:0; name:"Rotate"}
-          Slider {id:alphaCtrl; width:300; height:30; min:0; max:1; init:1; name:"Alpha"}
+          Slider {id:lineWidthCtrl; width:300; height:20; min:1; max:10; init:2; name:"Line width"}
+          Slider {id:scaleXCtrl; width:300; height:20; min:0.1; max:10; init:1; name:"ScaleX"}
+          Slider {id:scaleYCtrl; width:300; height:20; min:0.1; max:10; init:1; name:"ScaleY"}
+          Slider {id:rotateCtrl; width:300; height:20; min:0; max:Math.PI*2; init:0; name:"Rotate"}
+          Slider {id:alphaCtrl; width:300; height:20; min:0; max:1; init:1; name:"Alpha"}
         }
     }
   }

diff --git a/examples/quick/canvas/canvas.pro b/examples/quick/canvas/canvas.pro
new file mode 100644 (file)
index 0000000..5ae914a
--- /dev/null
+++ b/examples/quick/canvas/canvas.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+QT += quick declarative
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/canvas
+qml.files = canvas.qml  bezierCurve  clip quadraticCurveTo  roundedrect  smile  squircle  tiger
+qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/canvas
+INSTALLS += target qml
\ No newline at end of file

diff --git a/examples/quick/canvas/canvas.qml b/examples/quick/canvas/canvas.qml
new file mode 100644 (file)
index 0000000..bdb58f4
--- /dev/null
+++ b/examples/quick/canvas/canvas.qml
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import "../../shared" as Examples
+
+/*!
+    \title QtQuick Examples - Canvas
+    \example quick/canvas
+    \brief This is a collection of QML Canvas examples.
+
+    This is a collection of small QML examples relating to Canvas item. Each example is
+    a small QML file emphasizing a particular element or feature.
+
+    Red heart demonstrates using a bezierCurve API to stroke and fill a red heart.
+
+    Talk bubble demonstrates using a quadraticCurveTo API to stroke and fill a customized talk bubble,
+    this example also demonstrates the fillText API.
+
+    Squircle demonstrates using a collection of simple moveTo/lineTo path APIs to draw a smooth squircle.
+
+    Rounded rectangle demonstrates using a collection if lineTo/arcTo path APIs to draw a rounded rectangle.
+
+    Smile face demonstrates using several complex path APIs to draw an fill a smile face.
+
+    Clip demonstrates using clip API to clip a given image.
+
+    Tiger demonstrates using SVG path API to draw a tiger with a collection of SVG path strings.
+
+*/
+
+Item {
+    height: 480
+    width: 320
+    Examples.LauncherList {
+        id: ll
+        anchors.fill: parent
+        Component.onCompleted: {
+            addExample("Red heart", "Draws a red heart with bezier curves",  Qt.resolvedUrl("bezierCurve/bezierCurve.qml"));
+            addExample("Talk bubble", "Draws a talk bubble with quadratic curves",  Qt.resolvedUrl("quadraticCurveTo/quadraticCurveTo.qml"));
+            addExample("Squircle", "Draws a smooth squircle with simple lines",  Qt.resolvedUrl("squircle/squircle.qml"));
+            addExample("Rounded rectangle", "Draws a rounded rectangle with lines and arcs",  Qt.resolvedUrl("roundedrect/roundedrect.qml"));
+            addExample("Smile face", "Draws a smile face with complex paths",  Qt.resolvedUrl("smile/smile.qml"));
+            addExample("Clip", "Shows the canvas clip feature",  Qt.resolvedUrl("clip/clip.qml"));
+            addExample("Tiger", "Draw a tiger with a collection of SVG paths",  Qt.resolvedUrl("tiger/tiger.qml"));
+        }
+    }
+}

diff --git a/examples/quick/canvas/clip/clip.qml b/examples/quick/canvas/clip/clip.qml
index d861ff0..e8597f0 100644 (file)
--- a/examples/quick/canvas/clip/clip.qml
+++ b/examples/quick/canvas/clip/clip.qml
@@ -42,17 +42,17 @@ import QtQuick 2.0
 import "../contents"
 Item {
   id:container
-  width:360
-  height:600
+  width:320
+  height:480
 
   Column {
     spacing:5
     anchors.fill:parent
-    Text { font.pointSize:25; text:"Makes squircle icon with clip"; anchors.horizontalCenter:parent.horizontalCenter}
+    Text { font.pointSize:15; text:"Makes squircle icon with clip"; anchors.horizontalCenter:parent.horizontalCenter}
     Canvas {
       id:canvas
-      width:360
-      height:360
+      width:320
+      height:280
       property string strokeStyle:"blue"
       property string fillStyle:"steelblue"
       property int lineWidth:2
@@ -135,15 +135,15 @@ Item {
 
     Rectangle {
         id:controls
-        width:360
-        height:160
+        width:320
+        height:150
         Column {
           spacing:3
-          Slider {id:nCtrl; width:300; height:30; min:1; max:10; init:4; name:"N"}
-          Slider {id:rCtrl; width:300; height:30; min:30; max:180; init:100; name:"Radius"}
-          Slider {id:xCtrl; width:300; height:30; min:50; max:300; init:180; name:"X"}
-          Slider {id:yCtrl; width:300; height:30; min:30; max:300; init:220; name:"Y"}
-          Slider {id:alphaCtrl; width:300; height:30; min:0; max:1; init:1; name:"Alpha"}
+          Slider {id:nCtrl; width:300; height:20; min:1; max:10; init:4; name:"N"}
+          Slider {id:rCtrl; width:300; height:20; min:30; max:180; init:100; name:"Radius"}
+          Slider {id:xCtrl; width:300; height:20; min:50; max:300; init:180; name:"X"}
+          Slider {id:yCtrl; width:300; height:20; min:30; max:300; init:220; name:"Y"}
+          Slider {id:alphaCtrl; width:300; height:20; min:0; max:1; init:1; name:"Alpha"}
         }
     }
   }

diff --git a/examples/quick/canvas/contents/Button.qml b/examples/quick/canvas/contents/Button.qml
index 1413cdb..ab9ce35 100644 (file)
--- a/examples/quick/canvas/contents/Button.qml
+++ b/examples/quick/canvas/contents/Button.qml
@@ -84,4 +84,4 @@ Item {
             PropertyChanges { target: pressed; opacity: 1 }
         }
     ]
-}
\ No newline at end of file
+}

diff --git a/examples/quick/canvas/main.cpp b/examples/quick/canvas/main.cpp
new file mode 100644 (file)
index 0000000..64c2a55
--- /dev/null
+++ b/examples/quick/canvas/main.cpp
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "../../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(canvas)
\ No newline at end of file

diff --git a/examples/quick/canvas/quadraticCurveTo/quadraticCurveTo.qml b/examples/quick/canvas/quadraticCurveTo/quadraticCurveTo.qml
index bc3ca00..9be60c9 100644 (file)
--- a/examples/quick/canvas/quadraticCurveTo/quadraticCurveTo.qml
+++ b/examples/quick/canvas/quadraticCurveTo/quadraticCurveTo.qml
@@ -42,18 +42,18 @@ import QtQuick 2.0
 import "../contents"
 Item {
   id:container
-  width:360
-  height:600
+  width:320
+  height:480
 
   Column {
     spacing:5
     anchors.fill:parent
-    Text { font.pointSize:25; text:"Quadratic Curve"; anchors.horizontalCenter:parent.horizontalCenter}
+    Text { font.pointSize:15; text:"Quadratic Curve"; anchors.horizontalCenter:parent.horizontalCenter}
 
     Canvas {
       id:canvas
-      width:360
-      height:360
+      width:320
+      height:280
       property string strokeStyle:"steelblue"
       property string fillStyle:"yellow"
       property int lineWidth:lineWidthCtrl.value
@@ -113,15 +113,15 @@ Item {
 
     Rectangle {
         id:controls
-        width:360
-        height:160
+        width:320
+        height:150
         Column {
           spacing:3
-          Slider {id:lineWidthCtrl; width:300; height:30; min:1; max:10; init:2; name:"Line width"}
-          Slider {id:scaleXCtrl; width:300; height:30; min:0.1; max:10; init:1; name:"ScaleX"}
-          Slider {id:scaleYCtrl; width:300; height:30; min:0.1; max:10; init:1; name:"ScaleY"}
-          Slider {id:rotateCtrl; width:300; height:30; min:0; max:Math.PI*2; init:0; name:"Rotate"}
-          Slider {id:alphaCtrl; width:300; height:30; min:0; max:1; init:1; name:"Alpha"}
+          Slider {id:lineWidthCtrl; width:300; height:20; min:1; max:10; init:2; name:"Line width"}
+          Slider {id:scaleXCtrl; width:300; height:20; min:0.1; max:10; init:1; name:"ScaleX"}
+          Slider {id:scaleYCtrl; width:300; height:20; min:0.1; max:10; init:1; name:"ScaleY"}
+          Slider {id:rotateCtrl; width:300; height:20; min:0; max:Math.PI*2; init:0; name:"Rotate"}
+          Slider {id:alphaCtrl; width:300; height:20; min:0; max:1; init:1; name:"Alpha"}
         }
     }
   }

diff --git a/examples/quick/canvas/roundedrect/roundedrect.qml b/examples/quick/canvas/roundedrect/roundedrect.qml
index fd86c63..a773895 100644 (file)
--- a/examples/quick/canvas/roundedrect/roundedrect.qml
+++ b/examples/quick/canvas/roundedrect/roundedrect.qml
@@ -42,17 +42,17 @@ import QtQuick 2.0
 import "../contents"
 Item {
   id:container
-  width:360
-  height:600
+  width:320
+  height:480
 
   Column {
     spacing:5
     anchors.fill:parent
-    Text { font.pointSize:25; text:"Rounded rectangle"; anchors.horizontalCenter:parent.horizontalCenter}
+    Text { font.pointSize:15; text:"Rounded rectangle"; anchors.horizontalCenter:parent.horizontalCenter}
     Canvas {
         id:canvas
-        width:360
-        height:360
+        width:320
+        height:280
         smooth:true
         renderTarget:Canvas.Image
         renderStrategy: Canvas.Immediate
@@ -110,15 +110,15 @@ Item {
 
     Rectangle {
         id:controls
-        width:360
-        height:160
+        width:320
+        height:150
         Column {
           spacing:3
-          Slider {id:lineWidthCtrl; width:300; height:30; min:1; max:10; init:2; name:"Line width"}
-          Slider {id:rxCtrl; width:300; height:30; min:5; max:30; init:10; name:"rectx"}
-          Slider {id:ryCtrl; width:300; height:30; min:5; max:30; init:10; name:"recty"}
-          Slider {id:rCtrl; width:300; height:30; min:10; max:100; init:40; name:"Radius"}
-          Slider {id:alphaCtrl; width:300; height:30; min:0; max:1; init:1; name:"Alpha"}
+          Slider {id:lineWidthCtrl; width:300; height:20; min:1; max:10; init:2; name:"Line width"}
+          Slider {id:rxCtrl; width:300; height:20; min:5; max:30; init:10; name:"rectx"}
+          Slider {id:ryCtrl; width:300; height:20; min:5; max:30; init:10; name:"recty"}
+          Slider {id:rCtrl; width:300; height:20; min:10; max:100; init:40; name:"Radius"}
+          Slider {id:alphaCtrl; width:300; height:20; min:0; max:1; init:1; name:"Alpha"}
         }
     }
   }

diff --git a/examples/quick/canvas/smile/smile.qml b/examples/quick/canvas/smile/smile.qml
index 28a48a6..4ab040c 100644 (file)
--- a/examples/quick/canvas/smile/smile.qml
+++ b/examples/quick/canvas/smile/smile.qml
@@ -42,18 +42,18 @@ import QtQuick 2.0
 import "../contents"
 Item {
   id:container
-  width:360
-  height:600
+  width:320
+  height:480
 
   Column {
     spacing:5
     anchors.fill:parent
-    Text { font.pointSize:25; text:"Smile with arcs"; anchors.horizontalCenter:parent.horizontalCenter}
+    Text { font.pointSize:15; text:"Smile with arcs"; anchors.horizontalCenter:parent.horizontalCenter}
 
     Canvas {
         id:canvas
-        width:360
-        height:360
+        width:320
+        height:280
         smooth:true
         renderTarget:Canvas.Image
         renderStrategy: Canvas.Immediate
@@ -113,15 +113,15 @@ Item {
 
     Rectangle {
         id:controls
-        width:360
-        height:160
+        width:320
+        height:150
         Column {
           spacing:3
-          Slider {id:lineWidthCtrl; width:300; height:30; min:1; max:10; init:2; name:"Line width"}
-          Slider {id:scaleXCtrl; width:300; height:30; min:0.1; max:10; init:1; name:"ScaleX"}
-          Slider {id:scaleYCtrl; width:300; height:30; min:0.1; max:10; init:1; name:"ScaleY"}
-          Slider {id:rotateCtrl; width:300; height:30; min:0; max:Math.PI*2; init:0; name:"Rotate"}
-          Slider {id:alphaCtrl; width:300; height:30; min:0; max:1; init:1; name:"Alpha"}
+          Slider {id:lineWidthCtrl; width:300; height:20; min:1; max:10; init:2; name:"Line width"}
+          Slider {id:scaleXCtrl; width:300; height:20; min:0.1; max:10; init:1; name:"ScaleX"}
+          Slider {id:scaleYCtrl; width:300; height:20; min:0.1; max:10; init:1; name:"ScaleY"}
+          Slider {id:rotateCtrl; width:300; height:20; min:0; max:Math.PI*2; init:0; name:"Rotate"}
+          Slider {id:alphaCtrl; width:300; height:20; min:0; max:1; init:1; name:"Alpha"}
         }
     }
   }

diff --git a/examples/quick/canvas/squircle/squircle.qml b/examples/quick/canvas/squircle/squircle.qml
index 2fc65b6..e3e7640 100644 (file)
--- a/examples/quick/canvas/squircle/squircle.qml
+++ b/examples/quick/canvas/squircle/squircle.qml
@@ -42,13 +42,13 @@ import QtQuick 2.0
 import "../contents"
 Item {
   id:container
-  width:360
-  height:600
+  width:320
+  height:480
 
   Column {
     spacing:5
     anchors.fill:parent
-    Text { font.pointSize:25; text:"Squircles"; anchors.horizontalCenter:parent.horizontalCenter}
+    Text { font.pointSize:15; text:"Squircles"; anchors.horizontalCenter:parent.horizontalCenter}
     Image {
        anchors.horizontalCenter:parent.horizontalCenter
        source:"squircle.png"
@@ -57,8 +57,8 @@ Item {
     }
     Canvas {
         id:canvas
-        width:360
-        height:360
+        width:320
+        height:250
         smooth:true
         renderTarget:Canvas.Image
         renderStrategy: Canvas.Immediate
@@ -140,15 +140,15 @@ Item {
 
     Rectangle {
         id:controls
-        width:360
-        height:160
+        width:320
+        height:150
         Column {
           spacing:3
-          Slider {id:nCtrl; width:300; height:30; min:1; max:10; init:4; name:"N"}
-          Slider {id:rCtrl; width:300; height:30; min:30; max:180; init:100; name:"Radius"}
-          Slider {id:xCtrl; width:300; height:30; min:50; max:300; init:180; name:"X"}
-          Slider {id:yCtrl; width:300; height:30; min:30; max:300; init:220; name:"Y"}
-          Slider {id:alphaCtrl; width:300; height:30; min:0; max:1; init:1; name:"Alpha"}
+          Slider {id:nCtrl; width:300; height:20; min:1; max:10; init:4; name:"N"}
+          Slider {id:rCtrl; width:300; height:20; min:30; max:180; init:100; name:"Radius"}
+          Slider {id:xCtrl; width:300; height:20; min:50; max:300; init:180; name:"X"}
+          Slider {id:yCtrl; width:300; height:20; min:30; max:300; init:220; name:"Y"}
+          Slider {id:alphaCtrl; width:300; height:20; min:0; max:1; init:1; name:"Alpha"}
         }
     }
   }

diff --git a/examples/quick/canvas/tiger/tiger.qml b/examples/quick/canvas/tiger/tiger.qml
index 2eb1bb2..6b8e003 100644 (file)
--- a/examples/quick/canvas/tiger/tiger.qml
+++ b/examples/quick/canvas/tiger/tiger.qml
@@ -43,18 +43,18 @@ import "../contents"
 import "tiger.js" as Tiger
 Item {
   id:container
-  width:360
-  height:600
+  width:320
+  height:480
 
   Column {
     spacing:5
     anchors.fill:parent
-    Text { font.pointSize:25; text:"Tiger with SVG path"; anchors.horizontalCenter:parent.horizontalCenter}
+    Text { font.pointSize:15; text:"Tiger with SVG path"; anchors.horizontalCenter:parent.horizontalCenter}
 
     Canvas {
         id:canvas
-        width:360
-        height:360
+        width:320
+        height:280
         smooth:true
         renderTarget:Canvas.FramebufferObject
         renderStrategy: Canvas.Cooperative
@@ -115,14 +115,14 @@ Item {
     }
     Rectangle {
         id:controls
-        width:360
-        height:160
+        width:320
+        height:150
         Column {
           spacing:3
-          Slider {id:scaleXCtrl; width:300; height:30; min:0.1; max:10; init:0.5; name:"ScaleX"}
-          Slider {id:scaleYCtrl; width:300; height:30; min:0.1; max:10; init:0.5; name:"ScaleY"}
-          Slider {id:rotateCtrl; width:300; height:30; min:0; max:Math.PI*2; init:0; name:"Rotate"}
-          Slider {id:alphaCtrl; width:300; height:30; min:0; max:1; init:1; name:"Alpha"}
+          Slider {id:scaleXCtrl; width:300; height:20; min:0.1; max:10; init:0.5; name:"ScaleX"}
+          Slider {id:scaleYCtrl; width:300; height:20; min:0.1; max:10; init:0.5; name:"ScaleY"}
+          Slider {id:rotateCtrl; width:300; height:20; min:0; max:Math.PI*2; init:0; name:"Rotate"}
+          Slider {id:alphaCtrl; width:300; height:20; min:0; max:1; init:1; name:"Alpha"}
         }
     }
   }