X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=HomeScreen%2Fqml%2FShortcutArea.qml;h=1d7dd92be44365cf2a88a3303c01b6165bf44aae;hb=refs%2Ftags%2Fchinook%2F3.0.1;hp=684b84546e2ad7889d7b4a37d703983115e71285;hpb=b9f0e1049e70e9553a752d13de5d4023e85cc662;p=staging%2FHomeScreen.git

diff --git a/HomeScreen/qml/ShortcutArea.qml b/HomeScreen/qml/ShortcutArea.qml
index 684b845..1d7dd92 100644
--- a/HomeScreen/qml/ShortcutArea.qml
+++ b/HomeScreen/qml/ShortcutArea.qml
@@ -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)
@@ -70,7 +69,7 @@ Item {
                             applicationArea.visible = true
                             appLauncherAreaLauncher.visible = false
                             layoutHandler.makeMeVisible(pid)
-                            layoutHandler.showAppLayer()
+                            layoutHandler.showAppLayer(pid)
                         }
                         else {
                             console.warn("app cannot be launched!")