diff options
author | Nedim Hadzic <nedim.hadzic@pelagicore.com> | 2016-07-20 15:58:46 +0200 |
---|---|---|
committer | Nedim Hadzic <nedim.hadzic@pelagicore.com> | 2016-07-21 11:00:47 +0000 |
commit | 9b58bf335a9e0b23315339f5b333a8f84bd4b12d (patch) | |
tree | f5dedd1db1c0482ac850944ac44253a9a29c8bce /sysui | |
parent | 3d36a7b8e53770c91db60cec9586ef572a2f2814 (diff) | |
download | neptune-ui-9b58bf335a9e0b23315339f5b333a8f84bd4b12d.tar.gz |
Added special base screen for navigation app
Since navigation app takes the widget part on the
home screen, it has additional surface. Another
base was created so other apps do not initialize
surfaces and properties which they wont use.
Change-Id: Ie1bace5dcf47f8a6ec0fecc722e25d83ecc70a3c
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'sysui')
-rw-r--r-- | sysui/LaunchController.qml | 40 |
1 files changed, 9 insertions, 31 deletions
diff --git a/sysui/LaunchController.qml b/sysui/LaunchController.qml index 603beb1..2db80eb 100644 --- a/sysui/LaunchController.qml +++ b/sysui/LaunchController.qml @@ -128,8 +128,8 @@ StackView { function windowReadyHandler(index, item) { print(":::LaunchController::: WindowManager:windowReadyHandler", index, item) - var isWidget = (WindowManager.windowProperty(item, "windowType") === "widgetMap") - print(":::LaunchController:::isWidget", isWidget) + var isInWidgetState = (WindowManager.windowProperty(item, "windowType") === "widgetMap") + print(":::LaunchController:::isWidget", isInWidgetState) var isClusterWidget = (WindowManager.windowProperty(item, "windowType") === "clusterWidget") print(":::LaunchController:::isClusterWidget", isClusterWidget) var isPopup = (WindowManager.windowProperty(item, "windowType") === "popup") @@ -138,7 +138,7 @@ StackView { var acceptWindow = true; var appID = WindowManager.get(index).applicationId; - if (isWidget) { + if (isInWidgetState) { if (ApplicationManager.get(appID).categories[0] === "navigation") { NavigationService.mapWidget = item } @@ -224,33 +224,11 @@ StackView { if (name === "visibility" && value === false) { root.pop(null) var index = WindowManager.indexOfWindow(root.windowItem) - if (ApplicationManager.dummy) { - if (WindowManager.get(index).categories === "navigation") - WindowManager.setWindowProperty(root.windowItem, "windowType", "widget") - } - else { - if (ApplicationManager.get(WindowManager.get(index).applicationId).categories[0] === "navigation") { - // Sending after pop transition is done - WindowManager.setWindowProperty(root.windowItem, "windowType", "widget") - } - } - } - else if (name === "windowType" && value === "widgetMap") { - // Workaround for qmlscene - if (ApplicationManager.dummy) { - NavigationService.mapWidget = window - } - } - else if (name === "liveDrivePopupVisible") { - AppsService.liveDrivePopup = value - if (value) { - VehicleService.fuelTimer.start() - } - } - else if (name === "windowType" && value === "clusterWidget") { - // Workaround for qmlscene - if (ApplicationManager.dummy) { - AppsService.clusterWidgetReady("other", window) + + if (ApplicationManager.get(WindowManager.get(index).applicationId).categories[0] === "navigation") { + // Sending after pop transition is done + WindowManager.setWindowProperty(root.windowItem, "windowType", "widget") + } } else if (name === "windowType" && value === "popup") { @@ -285,7 +263,7 @@ StackView { var isPopup = (WindowManager.windowProperty(item, "windowType") === "popup") print(":::LaunchController:::isClusterWidget", isClusterWidget) print(":::LaunchController:::isWidget", isWidget, isMapWidget) - print(":::LaunchController:::isPopup", isPopup) + if (!isMapWidget && !isClusterWidget && !isPopup) { WindowManager.setWindowProperty(item, "visibility", true) WindowManager.setWindowProperty(item, "windowType", "fullScreen") |