diff options
author | Charles Yin <charles.yin@nokia.com> | 2011-09-16 11:55:01 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-16 03:56:35 +0200 |
commit | 3277b6f803b0f82c72ca2dc26a90cafb18067971 (patch) | |
tree | def2a7bcdfa08170accf939ce80e136fd1875237 /examples | |
parent | 23966bf69eb97314b1af232efa05fb3376275b0e (diff) |
rename threadRendering to renderInThread
Change-Id: I21d2492288adc84d3ef99633752e78a3ea232a4a
Reviewed-on: http://codereview.qt-project.org/5042
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Diffstat (limited to 'examples')
11 files changed, 17 insertions, 23 deletions
diff --git a/examples/declarative/canvas/bezierCurve/bezierCurve.qml b/examples/declarative/canvas/bezierCurve/bezierCurve.qml index bce3777b49..4d30c4dbd1 100644 --- a/examples/declarative/canvas/bezierCurve/bezierCurve.qml +++ b/examples/declarative/canvas/bezierCurve/bezierCurve.qml @@ -65,7 +65,7 @@ Item { property real rotate : rotateCtrl.value smooth:true renderTarget:Canvas.Image - threadRendering:false + renderInThread:false Behavior on scaleX { SpringAnimation { spring: 2; damping: 0.2; loops:Animation.Infinite } } diff --git a/examples/declarative/canvas/clip/clip.qml b/examples/declarative/canvas/clip/clip.qml index 58925e68b6..f2397c6ca6 100644 --- a/examples/declarative/canvas/clip/clip.qml +++ b/examples/declarative/canvas/clip/clip.qml @@ -66,7 +66,7 @@ Item { property string imagefile:"../contents/qt-logo.png" smooth:true renderTarget:Canvas.Image - threadRendering:false + renderInThread:false Component.onCompleted:loadImage(canvas.imagefile); onAlphaChanged:requestPaint(); diff --git a/examples/declarative/canvas/contents/Button.qml b/examples/declarative/canvas/contents/Button.qml index 410c7421ae..3c41a19178 100644 --- a/examples/declarative/canvas/contents/Button.qml +++ b/examples/declarative/canvas/contents/Button.qml @@ -84,4 +84,4 @@ Item { PropertyChanges { target: pressed; opacity: 1 } } ] -} +}
\ No newline at end of file diff --git a/examples/declarative/canvas/pixels/pixels.qml b/examples/declarative/canvas/pixels/pixels.qml index 97af7469e7..8047bb1e2d 100644 --- a/examples/declarative/canvas/pixels/pixels.qml +++ b/examples/declarative/canvas/pixels/pixels.qml @@ -55,8 +55,8 @@ Item { width:360 height:360 smooth:true - renderTarget:Canvas.Image - threadRendering:false + renderTarget:Canvas.FramebufferObject + renderInThread:false property string image :"../contents/qt-logo.png" Component.onCompleted:loadImage(image); onImageLoaded:requestPaint(); diff --git a/examples/declarative/canvas/quadraticCurveTo/quadraticCurveTo.qml b/examples/declarative/canvas/quadraticCurveTo/quadraticCurveTo.qml index 76b09d8e41..00d9e9d2dc 100644 --- a/examples/declarative/canvas/quadraticCurveTo/quadraticCurveTo.qml +++ b/examples/declarative/canvas/quadraticCurveTo/quadraticCurveTo.qml @@ -65,7 +65,7 @@ Item { property real rotate : rotateCtrl.value smooth:true renderTarget:Canvas.Image - threadRendering:false + renderInThread:false onLineWidthChanged:requestPaint(); onFillChanged:requestPaint(); @@ -106,8 +106,7 @@ Item { ctx.fillStyle="green"; ctx.font = "Bold 15px"; - // ctx.fillText("QML酷毙了", 30, 60); //BUG(in Linux):can't show multiple Chinese characters correctly. - ctx.fillText("QML酷 毙 了 !", 35, 65); + ctx.fillText("QML酷毙了", 30, 60); } } diff --git a/examples/declarative/canvas/roundedrect/roundedrect.qml b/examples/declarative/canvas/roundedrect/roundedrect.qml index bed4098207..50c07eac42 100644 --- a/examples/declarative/canvas/roundedrect/roundedrect.qml +++ b/examples/declarative/canvas/roundedrect/roundedrect.qml @@ -55,7 +55,7 @@ Item { height:360 smooth:true renderTarget:Canvas.Image - threadRendering:false + renderInThread:false property int radius: rCtrl.value property int rectx: rxCtrl.value diff --git a/examples/declarative/canvas/smile/smile.qml b/examples/declarative/canvas/smile/smile.qml index 9a75707efa..3a7fbe7cac 100644 --- a/examples/declarative/canvas/smile/smile.qml +++ b/examples/declarative/canvas/smile/smile.qml @@ -56,7 +56,7 @@ Item { height:360 smooth:true renderTarget:Canvas.Image - threadRendering:false + renderInThread:false property string strokeStyle:"green" property string fillStyle:"yellow" diff --git a/examples/declarative/canvas/squircle/squircle.qml b/examples/declarative/canvas/squircle/squircle.qml index 638abd97fb..f9845e849e 100644 --- a/examples/declarative/canvas/squircle/squircle.qml +++ b/examples/declarative/canvas/squircle/squircle.qml @@ -61,7 +61,7 @@ Item { height:360 smooth:true renderTarget:Canvas.Image - threadRendering:false + renderInThread:false property string strokeStyle:"blue" property string fillStyle:"steelblue" diff --git a/examples/declarative/canvas/stockchart/stock.qml b/examples/declarative/canvas/stockchart/stock.qml index c6fdd0ecb6..32ffac1a60 100644 --- a/examples/declarative/canvas/stockchart/stock.qml +++ b/examples/declarative/canvas/stockchart/stock.qml @@ -337,7 +337,7 @@ Rectangle { anchors.bottom : view.top width:container.width; opacity:0 - threadRendering:false + renderInThread:false renderTarget: Canvas.Image property bool running:false property int frames:first @@ -722,4 +722,4 @@ Rectangle { drawKLine(ctx, first, last, points, highestPrice); } } -} +}
\ No newline at end of file diff --git a/examples/declarative/canvas/tiger/tiger.qml b/examples/declarative/canvas/tiger/tiger.qml index 9adda4cfd8..5ec920436c 100644 --- a/examples/declarative/canvas/tiger/tiger.qml +++ b/examples/declarative/canvas/tiger/tiger.qml @@ -55,12 +55,11 @@ Item { id:canvas width:360 height:360 - smooth:false - renderTarget:Canvas.Image - threadRendering:false + smooth:true + renderTarget:Canvas.FramebufferObject + renderInThread:false property string strokeStyle:"steelblue" property string fillStyle:"yellow" - property int lineWidth:lineWidthCtrl.value property bool fill:true property bool stroke:true property real alpha:alphaCtrl.value @@ -69,7 +68,6 @@ Item { property real rotate : rotateCtrl.value property int frame:0 - onLineWidthChanged: requestPaint(); onFillChanged: requestPaint(); onStrokeChanged: requestPaint(); onAlphaChanged: requestPaint(); @@ -85,8 +83,7 @@ Item { onPaint: { var ctx = canvas.getContext('2d'); ctx.reset(); - ctx.fillStyle = "rgba(0,0,0,0)"; - ctx.fillRect(0, 0, canvas.width, canvas.height); + ctx.clearRect(0, 0, canvas.width, canvas.height); ctx.globalAlpha = canvas.alpha; ctx.scale(canvas.scaleX, canvas.scaleY); ctx.rotate(canvas.rotate); @@ -121,7 +118,6 @@ Item { height:160 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: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"} diff --git a/examples/declarative/canvas/twitterfriends/twitter.qml b/examples/declarative/canvas/twitterfriends/twitter.qml index b852e66744..685a59d948 100644 --- a/examples/declarative/canvas/twitterfriends/twitter.qml +++ b/examples/declarative/canvas/twitterfriends/twitter.qml @@ -84,7 +84,7 @@ Item { anchors.bottom : parent.bottom smooth:true renderTarget:Canvas.Image - threadRendering:false + renderInThread:false property bool layoutChanged:true property string twitterName:"" @@ -124,4 +124,3 @@ Item { } } } - |