X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreen%2Fqml%2FShortcutArea.qml;h=14c7b6be9508e7fe2dc0bc078adea525c23d1c1d;hb=09f2f0036f122e49aa49e6c446d723850192a725;hp=aeaf097ab3a78e9b33cf260353e8f85c2c4b1bf6;hpb=57e18aeaf2a9ae292af7559580f8154527fc04f5;p=staging%2FHomeScreen.git

diff --git a/HomeScreen/qml/ShortcutArea.qml b/HomeScreen/qml/ShortcutArea.qml
index aeaf097..14c7b6b 100644
--- a/HomeScreen/qml/ShortcutArea.qml
+++ b/HomeScreen/qml/ShortcutArea.qml
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The Qt Company Ltd.
- * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
+ * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ Item {
         id: applicationModel
         ListElement {
             name: 'Home'
-            application: 'home@0.1'
+            application: ''
         }
         ListElement {
             name: 'Multimedia'
@@ -40,11 +40,10 @@ Item {
         }
         ListElement {
             name: 'Navigation'
-            application: 'controls@0.1'
+            application: 'navigation@0.1'
         }
     }
 
-    property int currentIndex: -1 // TODO: to be moved to whereever right
     property int pid: -1
 
     RowLayout {
@@ -56,13 +55,13 @@ Item {
                 Layout.fillWidth: true
                 Layout.fillHeight: true
                 name: model.name
-                active: model.index === root.currentIndex
+                active: model.application === launcher.current
                 onClicked: {
-                    root.currentIndex = active ? -1 : model.index
                     if (0 === model.index) {
                         appLauncherAreaLauncher.visible = true
                         applicationArea.visible = false
                         layoutHandler.hideAppLayer()
+                        launcher.current = ''
                     }
                     else {
                         pid = launcher.launch(model.application)