diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2016-03-29 15:29:40 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2016-03-31 11:21:23 +0000 |
| commit | 06f7c31251fb2d47037f6ac5e9592bfabdc7fda3 (patch) | |
| tree | 5e5055937037094eed16a10ab7639cf83a04b266 /sysui | |
| parent | e8c52213752f4124d892ee104727c5be772bcd6b (diff) | |
| download | neptune-ui-06f7c31251fb2d47037f6ac5e9592bfabdc7fda3.tar.gz | |
Fixed the Music ClusterWidget to correctly show in the IC
Also enabled the IC for multi-process support
Change-Id: I91902d4471b534e7a22d034b81a64be139c7d08b
Reviewed-by: Nedim Hadzic <nedim.hadzic@pelagicore.com>
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/Cluster/Middle.qml | 27 | ||||
| -rw-r--r-- | sysui/Cluster/WidgetContainer.qml | 4 |
2 files changed, 17 insertions, 14 deletions
diff --git a/sysui/Cluster/Middle.qml b/sysui/Cluster/Middle.qml index e14b6c3..26e2dd7 100644 --- a/sysui/Cluster/Middle.qml +++ b/sysui/Cluster/Middle.qml @@ -67,8 +67,6 @@ Item { width: stack.width height: stack.height title: "NAVIGATOR" - - Tracer {} } WidgetContainer { id: musicContainer @@ -94,23 +92,26 @@ Item { Connections { target: AppsService onClusterWidgetReady: { -// if (category === "media") { -// musicContainer.content = item -// stack.currentIndex = 1 -// } - if (category === "navigation") { - navContainer.content = item + var container; + if (category === "media") { + container = musicContainer + stack.currentIndex = 1 + } else if (category === "navigation") { + container = navContainer stack.currentIndex = 0 + } else { + container = otherContainer + stack.currentIndex = 2 } -// else { -// otherContainer.content = item -// stack.currentIndex = 2 -// } + + item.parent = container + container.content = item + item.width = container.width + item.height = container.height } } Keys.onPressed: { - //print("key pressed", Qt.Key_Plus, event.key) if (event.key === Qt.Key_Right) { if (stack.currentIndex < stack.count) stack.currentIndex++ diff --git a/sysui/Cluster/WidgetContainer.qml b/sysui/Cluster/WidgetContainer.qml index ce51c59..6f460e5 100644 --- a/sysui/Cluster/WidgetContainer.qml +++ b/sysui/Cluster/WidgetContainer.qml @@ -41,8 +41,10 @@ Item { default property alias content: container.children Keys.onPressed: { - if (container.children[0]) + if (container.children[0]) { WindowManager.setSurfaceWindowProperty(container.children[0], "keyPressed", event.key) + WindowManager.setSurfaceWindowProperty(container.children[0], "keyPressed", 0) + } } Item { |