diff --git a/src/activities/clickgame/Clickgame.qml b/src/activities/clickgame/Clickgame.qml --- a/src/activities/clickgame/Clickgame.qml +++ b/src/activities/clickgame/Clickgame.qml @@ -71,7 +71,8 @@ id: score anchors { - bottom: parent.bottom + top: parent.top + bottom: undefined right: parent.right margins: 20 * ApplicationInfo.ratio } diff --git a/src/activities/clickgame/Fish.qml b/src/activities/clickgame/Fish.qml --- a/src/activities/clickgame/Fish.qml +++ b/src/activities/clickgame/Fish.qml @@ -69,6 +69,8 @@ } onXChanged: { + var minY = (Activity.items.score.y+Activity.items.score.height); + var maxY = (bar.y-fish.height); if( (x > background.width - fish.width && rotate.angle == 0) || (x == targetX && rotate.angle == 0) ) { rotateLeftAnimation.start() @@ -76,7 +78,7 @@ x = targetX var barHeight = ApplicationSettings.isBarHidden ? bar.height / 2 : bar.height y = Activity.currentLevel > 0 - ? Math.random() * (background.height - barHeight - fish.height) + ? (Math.random() * (maxY - minY + 1)) + minY : y } else if(x == 0 && rotate.angle == 180) { rotateRightAnimation.start() diff --git a/src/activities/clickgame/clickgame.js b/src/activities/clickgame/clickgame.js --- a/src/activities/clickgame/clickgame.js +++ b/src/activities/clickgame/clickgame.js @@ -279,13 +279,15 @@ function createFish(minDuration) { var fishSource = fishes[Math.floor(Math.random() * fishes.length)] + var minY = (items.score.y+items.score.height); + var maxY = (bar.y-fishSource.height); var fish = component.createObject( background, { "activity": activity, "background": background, "bar": bar, - "y": Math.random() * (background.height - bar.height - fishSource.height), + "y": (Math.random() * (maxY - minY + 1)) + minY, "width": fishSource.width * 1.1 * GCompris.ApplicationInfo.ratio, "height": fishSource.height * 1.1 * GCompris.ApplicationInfo.ratio, "source": "qrc:/gcompris/src/activities/clickgame/resource/" + @@ -293,7 +295,6 @@ "frameCount": fishSource.nbFrame, "duration": minDuration + Math.floor(Math.random() * 5000) }); - if (fish === null) { // Error Handling console.log("Error creating object");