Forward unhandled key events to the cluster

This way the ivi can be the active window and the cluster can still be controlled Change-Id: Ib600104b12ad2cf1a842dc683c35a9319257bf5c Reviewed-by: Nedim Hadzic <[email protected]>
Kfanup · Sep 1, 2016 · dc7f8ff · dc7f8ff
1 parent 9ebe067
commit dc7f8ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/Main.qml b/Main.qml
@@ -59,6 +59,9 @@ Rectangle {
             root.height = Window.height
     }
 
+    //Forwards the keys to the cluster to handle it without being the active window
+    Keys.forwardTo: cluster ? cluster.clusterItem : null
+
     Item {
         width: Style.screenWidth
         height: Style.screenHeight
@@ -87,9 +90,13 @@ Rectangle {
             width: Style.clusterWidth
             visible: false
 
+            property Item clusterItem: clusterItem
+
             color: "black"
 
-            Cluster {}
+            Cluster {
+                id: clusterItem
+            }
 
             function calculateSize() {
                 print (Screen.width, Screen.height)
@@ -104,12 +111,8 @@ Rectangle {
                 cluster.show()
                 calculateSize()
             }
-        }
-    }
 
-    Window.onActiveChanged: {
-        if (Window.active && !WindowManager.runningOnDesktop)
-            cluster.requestActivate()
+        }
     }
 
     Component.onCompleted: {

diff --git a/sysui/Cluster/Cluster.qml b/sysui/Cluster/Cluster.qml
@@ -87,7 +87,7 @@ Item {
         }
     }
 
-    Keys.forwardTo: Style.debugMode ? [layouter] : null
+    Keys.forwardTo: Style.debugMode ? [layouter] : widgetBase
 
     property var layoutTarget//: notifications
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,7 +87,7 @@ Item { @@
             }
         }
-        Keys.forwardTo: Style.debugMode ? [layouter] : null
+        Keys.forwardTo: Style.debugMode ? [layouter] : widgetBase
         property var layoutTarget//: notifications
@@ Expand Down @@