mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: don't show bogus warning if page stack is reset

Browse source 
As we clear all the pages from the stack, we can briefly have no valid currentItem.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-08-08 19:49:48 -07:00
parent ae6756e7f1
commit f8d551ac6e
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
mobile-widgets/qml/main.qml
View file

@ -546,18 +546,22 @@ if you have network connectivity and want to sync your data to cloud storage."),
// This is called whenever the user navigates using the breadcrumbs in the header
// disable the left swipe to go back when on the map page
stackView.interactive = pageStack.currentItem.objectName !== mapPage.objectName
if (pageStack.currentItem === null) {
console.log("there's no current page")
} else {
stackView.interactive = pageStack.currentItem.objectName !== mapPage.objectName
// is there a better way to reload the map markers instead of doing that
// every time the map page is shown - e.g. link to the dive list model somehow?
if (pageStack.currentItem.objectName === mapPage.objectName)
mapPage.reloadMap()
// is there a better way to reload the map markers instead of doing that
// every time the map page is shown - e.g. link to the dive list model somehow?
if (pageStack.currentItem.objectName === mapPage.objectName)
mapPage.reloadMap()
// In case we land on any page, not being the DiveDetails (which can be
// in multiple states, such as add, edit or view), just end the edit/add mode
if (pageStack.currentItem.objectName !== "DiveDetails" &&
(detailsWindow.state === 'edit' || detailsWindow.state === 'add')) {
// In case we land on any page, not being the DiveDetails (which can be
// in multiple states, such as add, edit or view), just end the edit/add mode
if (pageStack.currentItem.objectName !== "DiveDetails" &&
(detailsWindow.state === 'edit' || detailsWindow.state === 'add')) {
detailsWindow.endEditMode()
}
}
}