From 4ffabfd461127146808bd9d3416f326fb9fa7969 Mon Sep 17 00:00:00 2001 From: "Jan Sprinz (NeoTheThird)" Date: Mon, 17 Jul 2017 20:22:53 +0200 Subject: [PATCH] Break landscape mode again :( --- po/8192.pot | 14 +++++++------- qml/Main.qml | 13 +++++++------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/po/8192.pot b/po/8192.pot index a21f291..80d7a40 100644 --- a/po/8192.pot +++ b/po/8192.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 8192\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-07-17 16:07+0000\n" +"POT-Creation-Date: 2017-07-17 18:22+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,7 +26,7 @@ msgid "HIGHSCORE" msgstr "" #: ../qml/modules/Footer.qml:61 ../qml/modules/Footer.qml:69 -#: ../qml/Main.qml:171 ../qml/Main.qml:189 +#: ../qml/Main.qml:172 ../qml/Main.qml:190 msgid "Restart" msgstr "" @@ -78,23 +78,23 @@ msgstr "" msgid "Welcome to 8192" msgstr "" -#: ../qml/Main.qml:161 +#: ../qml/Main.qml:162 msgid "Victory" msgstr "" -#: ../qml/Main.qml:164 +#: ../qml/Main.qml:165 msgid "Keep going" msgstr "" -#: ../qml/Main.qml:185 +#: ../qml/Main.qml:186 msgid "Game over. :(" msgstr "" -#: ../qml/Main.qml:186 +#: ../qml/Main.qml:187 msgid "Score" msgstr "" -#: ../qml/Main.qml:198 +#: ../qml/Main.qml:199 msgid "Quit" msgstr "" diff --git a/qml/Main.qml b/qml/Main.qml index 30703b6..21e3d0a 100644 --- a/qml/Main.qml +++ b/qml/Main.qml @@ -99,13 +99,14 @@ Window { Column { id: gameColumn - width: (parent.width - units.gu(2) < parent.height - header.height - footer.height - units.gu(10)) - ? parent.width - units.gu(2) - : parent.height - header.height - footer.height - units.gu(10) - height: header.height + game.height + footer.height + units.gu(2) anchors { - centerIn: parent - verticalCenterOffset: units.gu(3) + fill: parent + margins: units.gu(1) + topMargin: units.gu(7) + leftMargin: footer.bottom.x - units.gu(1) < gamePage.bottom.x ? + gamePage.width - width : units.gu(1) + rightMargin: footer.bottom.x - units.gu(1) > gamePage.bottom.x ? + gamePage.width - width : units.gu(1) } spacing: units.gu(1)