aboutsummaryrefslogtreecommitdiffstats
path: root/mobile-widgets/qml
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2019-10-05 20:27:05 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-10-13 11:32:27 -0700
commit5025943bc414a9dd9217a93d596f006a766b047e (patch)
tree3ec482a10709c83be32bb76d1927fc49dd74fe1d /mobile-widgets/qml
parentb9861a0059e558ed148d21539c155296325bc803 (diff)
downloadsubsurface-5025943bc414a9dd9217a93d596f006a766b047e.tar.gz
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 <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets/qml')
-rw-r--r--mobile-widgets/qml/DiveDetails.qml1
-rw-r--r--mobile-widgets/qml/MapPage.qml2
-rw-r--r--mobile-widgets/qml/main.qml3
3 files changed, 3 insertions, 3 deletions
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 {