diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-02 07:09:09 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-05 02:40:47 (GMT) |
| commit | 3490b478ed02859f0355438efba900cd853e9c13 (patch) | |
| tree | f554feca685671aef6775da255150a122597c258 /demos | |
| parent | b3605d7f45c1cdb61bbd2a572e58bd29aaea6956 (diff) | |
| download | Qt-3490b478ed02859f0355438efba900cd853e9c13.zip Qt-3490b478ed02859f0355438efba900cd853e9c13.tar.gz Qt-3490b478ed02859f0355438efba900cd853e9c13.tar.bz2 | |
Reenable types/enums and move scripts into an isolated scope
Diffstat (limited to 'demos')
| -rwxr-xr-x | demos/declarative/samegame/content/samegame.js | 5 | ||||
| -rw-r--r-- | demos/declarative/samegame/samegame.qml | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/demos/declarative/samegame/content/samegame.js b/demos/declarative/samegame/content/samegame.js index 09057eb..7deafde 100755 --- a/demos/declarative/samegame/content/samegame.js +++ b/demos/declarative/samegame/content/samegame.js @@ -22,6 +22,11 @@ function timeStr(msecs) { return ret; } +function getTileSize() +{ + return tileSize; +} + function initBoard() { for(var i = 0; i<maxIndex; i++){ diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml index ede4362..2d00208 100644 --- a/demos/declarative/samegame/samegame.qml +++ b/demos/declarative/samegame/samegame.qml @@ -23,8 +23,8 @@ Rectangle { property int score: 0 z: 20; anchors.centerIn: parent - width: parent.width - (parent.width % tileSize); - height: parent.height - (parent.height % tileSize); + width: parent.width - (parent.width % getTileSize()); + height: parent.height - (parent.height % getTileSize()); MouseRegion { id: gameMR |