diff --git a/src/activities/erase/Block.qml b/src/activities/erase/Block.qml --- a/src/activities/erase/Block.qml +++ b/src/activities/erase/Block.qml @@ -28,21 +28,26 @@ id: block property Item main property Item bar + property Item background property double ix property double iy property int nbx property int nby x: ix * main.width / nbx - y: iy * (main.height - bar.height / 2) / nby + y: iy * (main.height - bar.height) / (nby + getMultipleOfRatioToAdjustHeight() * ApplicationInfo.ratio) width: main.width / nbx - height: (main.height - bar.height / 2) / nby + height: (main.height - bar.height) / (nby + getMultipleOfRatioToAdjustHeight() * ApplicationInfo.ratio) signal enter signal leave property string type property int counter: 0 + function getMultipleOfRatioToAdjustHeight() { + return (background.width > background.height + 40 * ApplicationInfo.ratio) ? 0.125 : 0.625 + } + onEnter: { if(opacity == 1.0) { playSound() diff --git a/src/activities/erase/Erase.qml b/src/activities/erase/Erase.qml --- a/src/activities/erase/Erase.qml +++ b/src/activities/erase/Erase.qml @@ -99,6 +99,7 @@ type: activity.type main: MAIN bar: BAR + background: items.background } } @@ -124,8 +125,9 @@ } Score { + id: score anchors { - bottom: parent.bottom + bottom: (background.width > background.height + 40 * ApplicationInfo.ratio) ? background.bottom : bar.top bottomMargin: 10 * ApplicationInfo.ratio right: parent.right rightMargin: 10 * ApplicationInfo.ratio diff --git a/src/activities/erase/erase.js b/src/activities/erase/erase.js --- a/src/activities/erase/erase.js +++ b/src/activities/erase/erase.js @@ -22,6 +22,7 @@ .pragma library .import QtQuick 2.6 as Quick +.import GCompris 1.0 as GCompris //for ApplicationInfo .import "qrc:/gcompris/src/core/core.js" as Core var url = "qrc:/gcompris/src/activities/erase/resource/" @@ -128,8 +129,8 @@ } createdBlocks = 0 killedBlocks = 0 - var nbx = (currentLevel % 2 * 3) + 5; - var nby = (currentLevel % 2 * 3) + 5; + var nbx = Math.min((currentLevel % 2 * 3) + 5, main.width / (10 * GCompris.ApplicationInfo.ratio)); + var nby = Math.min((currentLevel % 2 * 3) + 5, main.height / (10 * GCompris.ApplicationInfo.ratio)); var w = main.width / nbx var h = (main.height - items.bar.height) / nby var i = 0