diff --git a/src/activities/hangman/Hangman.qml b/src/activities/hangman/Hangman.qml --- a/src/activities/hangman/Hangman.qml +++ b/src/activities/hangman/Hangman.qml @@ -120,12 +120,12 @@ font.letterSpacing: 0.5 width: parent.width * 0.9 wrapMode: Text.WordWrap + fontSizeMode: Text.Fit horizontalAlignment: Text.AlignHCenter anchors { horizontalCenter: parent.horizontalCenter bottom: bar.top bottomMargin: 5 * ApplicationInfo.ratio - } z: 11 } @@ -136,6 +136,7 @@ fontSize: smallSize color: "#FFFFFF" wrapMode: Text.WordWrap + fontSizeMode: Text.Fit horizontalAlignment: Text.AlignHCenter width: parent.width - 2*clock.width anchors { @@ -352,24 +353,27 @@ Score { id: score - anchors.top: undefined - anchors.topMargin: 10 * ApplicationInfo.ratio - anchors.right: parent.right - anchors.rightMargin: 10 * ApplicationInfo.ratio - anchors.bottom: keyboard.top + height: 1.2 * internalTextComponent.height + width: 1.5 * internalTextComponent.width + anchors { + bottom: keyboard.enabled ? keyboard.top : parent.bottom + bottomMargin: keyboard.enabled ? 1.2 * bar.height : 0.55 * parent.height + right: parent.right + rightMargin: 0.025 * parent.width + } } BarButton { - id: ok - source: "qrc:/gcompris/src/core/resource/bar_ok.svg"; - sourceSize.width: 75 * ApplicationInfo.ratio - visible: false - anchors { - bottom: score.top - horizontalCenter: score.horizontalCenter - bottomMargin: 10 * ApplicationInfo.ratio - } - onClicked: Activity.nextSubLevel() + id: ok + source: "qrc:/gcompris/src/core/resource/bar_ok.svg"; + sourceSize.width: 0.15 * parent.height + visible: false + anchors { + bottom: score.top + horizontalCenter: score.horizontalCenter + bottomMargin: 5 * ApplicationInfo.ratio + } + onClicked: Activity.nextSubLevel() } JsonParser {