diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2016-03-08 18:28:21 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2016-03-08 17:42:27 +0000 |
| commit | a3b43b2fc6fc487fc229e2992412b4e066f66a19 (patch) | |
| tree | 6fabee62b8d9b9553889feab186da7e48edcd71d /sysui | |
| parent | 7409bbb5c21013f7f9f6be3a444817e7d2187474 (diff) | |
| download | neptune-ui-a3b43b2fc6fc487fc229e2992412b4e066f66a19.tar.gz | |
Fix closing of wayland windows
Also removed some legacy window-management leftovers
Change-Id: I5a99dbd9a823ef40fa69a5458328f4caa775e266
Reviewed-by: Thomas Senyk <thomas.senyk@pelagicore.com>
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/Home/HomePage.qml | 2 | ||||
| -rw-r--r-- | sysui/LaunchController.qml | 8 | ||||
| -rw-r--r-- | sysui/MenuScreen.qml | 10 |
3 files changed, 3 insertions, 17 deletions
diff --git a/sysui/Home/HomePage.qml b/sysui/Home/HomePage.qml index d70b32e..7016ceb 100644 --- a/sysui/Home/HomePage.qml +++ b/sysui/Home/HomePage.qml @@ -43,8 +43,6 @@ UIPage { anchors.bottom: parent.bottom property bool leftMap: true - signal showScreen(url url) - signal closeScreen() // Left widget side MapWidget { diff --git a/sysui/LaunchController.qml b/sysui/LaunchController.qml index cef50ca..03a1a91 100644 --- a/sysui/LaunchController.qml +++ b/sysui/LaunchController.qml @@ -190,15 +190,13 @@ StackView { } function surfaceItemClosingHandler(index, item) { - if (item === windowContainer.windowItem) { // start close animation - root.pop(item) - } else { - WindowManager.releaseSurfaceItem(index, item) // immediately close anything which is not handled by this container + if (item === root.windowItem) { // start close animation + root.pop() } } function surfaceItemLostHandler(index, item) { - // TODO + WindowManager.releaseSurfaceItem(index, item) // immediately close anything which is not handled by this container } function getSurfaceIndex(item) { diff --git a/sysui/MenuScreen.qml b/sysui/MenuScreen.qml index 0934125..f3b91c5 100644 --- a/sysui/MenuScreen.qml +++ b/sysui/MenuScreen.qml @@ -43,14 +43,6 @@ PageSwipeScreen { title: currentItem.title - function showScreen(url) { - Stack.view.push(url) - } - - function closeScreen() { - Stack.view.pop() - } - statusItem: PageIndicator { count: root.count currentIndex: root.currentIndex @@ -75,8 +67,6 @@ PageSwipeScreen { HomePage { width: root.itemWidth height: root.height - onShowScreen: root.showScreen(url) - onCloseScreen: root.closeScreen() } LauncherPage { id: launcher |