summaryrefslogtreecommitdiffstats
path: root/demos/declarative/samegame/content/samegame.js
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-07-20 04:34:26 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-07-20 04:34:26 (GMT)
commitc8b42c5851377c075c2c4147a625f23f2f6f6173 (patch)
treeed1e3717dfe99ace7044d2817744d0b3fa2d304a /demos/declarative/samegame/content/samegame.js
parent2b55d441c6ef87a641d7e7c13ed2e766c6211829 (diff)
downloadQt-c8b42c5851377c075c2c4147a625f23f2f6f6173.zip
Qt-c8b42c5851377c075c2c4147a625f23f2f6f6173.tar.gz
Qt-c8b42c5851377c075c2c4147a625f23f2f6f6173.tar.bz2
Use the images from Same Gnome as our second theme.
Also stopped switching background as part of the theme, partly because SameGnome doesn't have a background image and partly because it wasn't working right anyway.
Diffstat (limited to 'demos/declarative/samegame/content/samegame.js')
-rw-r--r--demos/declarative/samegame/content/samegame.js9
1 files changed, 2 insertions, 7 deletions
diff --git a/demos/declarative/samegame/content/samegame.js b/demos/declarative/samegame/content/samegame.js
index d2a3cbc..925a5b8 100644
--- a/demos/declarative/samegame/content/samegame.js
+++ b/demos/declarative/samegame/content/samegame.js
@@ -6,7 +6,6 @@ var tileSize = 40;
var maxIndex = maxX*maxY;
var board = new Array(maxIndex);
var tileSrc = "content/BoomBlock.qml";
-var backSrc = "content/pics/background.png";
var swapped = false;
var compSrc;
@@ -15,12 +14,10 @@ var component;
function swapTileSrc(){
if(swapped)
return;
- if(tileSrc == "content/FastBlock.qml"){
+ if(tileSrc == "content/SpinBlock.qml"){
tileSrc = "content/BoomBlock.qml";
- backSrc = "content/pics/background.png";
}else{
- backSrc = "content/pics/qtlogo.png";
- tileSrc = "content/FastBlock.qml";
+ tileSrc = "content/SpinBlock.qml";
}
swapped = true;
}
@@ -37,8 +34,6 @@ function initBoard()
board[i].destroy();
}
- background.source = backSrc;
- swapped = false;
maxX = Math.floor(gameCanvas.width/tileSize);
maxY = Math.floor(gameCanvas.height/tileSize);
maxIndex = maxX*maxY;