From 5025943bc414a9dd9217a93d596f006a766b047e Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 5 Oct 2019 20:27:05 -0700 Subject: Mobile: don't make sub-pages fill the parent This had very strange results with the current Kirigami. Instead set the width of those pages based on our overall column width. Signed-off-by: Dirk Hohndel --- mobile-widgets/qml/DiveDetails.qml | 1 + mobile-widgets/qml/MapPage.qml | 2 +- mobile-widgets/qml/main.qml | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'mobile-widgets/qml') diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index ce6ba3411..a4821ce62 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -59,6 +59,7 @@ Kirigami.Page { rightPadding: 0 bottomPadding: 0 background: Rectangle { color: subsurfaceTheme.backgroundColor } + width: rootItem.colWidth states: [ State { diff --git a/mobile-widgets/qml/MapPage.qml b/mobile-widgets/qml/MapPage.qml index f000c2020..dcde2bf0b 100644 --- a/mobile-widgets/qml/MapPage.qml +++ b/mobile-widgets/qml/MapPage.qml @@ -13,7 +13,7 @@ Kirigami.Page { rightPadding: 0 bottomPadding: 0 property bool firstRun: true - + width: rootItem.colWidth MapWidget { id: mapWidget anchors.fill: parent diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index 02ea0fadd..150c6d1ed 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -127,6 +127,7 @@ Kirigami.ApplicationWindow { } globalDrawer: Kirigami.GlobalDrawer { + height: rootItem.height topContent: Image { source: "qrc:/qml/icons/dive.jpg" Layout.fillWidth: true @@ -661,7 +662,6 @@ if you have network connectivity and want to sync your data to cloud storage."), DiveDetails { id: detailsWindow visible: false - anchors.fill: parent } Log { @@ -682,7 +682,6 @@ if you have network connectivity and want to sync your data to cloud storage."), MapPage { id: mapPage visible: false - anchors.fill: parent } ThemeTest { -- cgit v1.2.3-70-g09d2