aboutsummaryrefslogtreecommitdiffstats
path: root/sysui
diff options
context:
space:
mode:
authorNedim Hadzic <nedim.hadzic@pelagicore.com>2016-07-20 15:01:33 +0200
committerNedim Hadzic <nedim.hadzic@pelagicore.com>2016-07-22 08:39:46 +0000
commit4b264d21ed5cee49c6fb86daa17cc3596f7cbdf1 (patch)
tree09b4d58ebfccd3ce3ef38eaab4e4bce2919a0de3 /sysui
parent9b58bf335a9e0b23315339f5b333a8f84bd4b12d (diff)
Removed popup wayland surface
There was a popup support which was creating a new wayland surface for each app. With this commit this approach was removed since we would like to use org.freedesktop.Notification both for notifications and popups. In that way we would render popup just on one place and the system ui would have the ownership. Change-Id: I4f8eb5faccc4de4eb3b574ea1d6f5ab27cae4dc7 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'sysui')
-rw-r--r--sysui/LaunchController.qml25
1 files changed, 2 insertions, 23 deletions
diff --git a/sysui/LaunchController.qml b/sysui/LaunchController.qml
index 2db80eb..0e7af72 100644
--- a/sysui/LaunchController.qml
+++ b/sysui/LaunchController.qml
@@ -132,8 +132,6 @@ StackView {
print(":::LaunchController:::isWidget", isInWidgetState)
var isClusterWidget = (WindowManager.windowProperty(item, "windowType") === "clusterWidget")
print(":::LaunchController:::isClusterWidget", isClusterWidget)
- var isPopup = (WindowManager.windowProperty(item, "windowType") === "popup")
- print(":::LaunchController:::isPopup", isPopup)
var acceptWindow = true;
var appID = WindowManager.get(index).applicationId;
@@ -157,13 +155,7 @@ StackView {
}
acceptWindow = false
}
- }
- else if (isPopup) {
- if (ApplicationManager.get(appID).categories[0] === "navigation")
- AppsService.sendNavigationPopup(item)
- acceptWindow = false
- }
- else {
+ } else {
for (var i = 0; i < root.blackListItems.length; ++i) {
if (appID === root.blackListItems[i])
@@ -231,24 +223,12 @@ StackView {
}
}
- else if (name === "windowType" && value === "popup") {
- // Workaround for qmlscene
- if (ApplicationManager.dummy) {
- AppsService.sendNavigationPopup(window)
- }
- }
else if (name === "goTo" && value === "fullScreen") {
index = WindowManager.indexOfWindow(window)
//print(":::LaunchController::: App found. Going to full screen the app ", index, WindowManager.get(index).applicationId)
ApplicationManager.startApplication(WindowManager.get(index).applicationId)
WindowManager.setWindowProperty(window, "goTo", "")
}
- else if (name === "liveDriveEvent") {
- NavigationService.liveDriveEvent = value
- }
- else if (name === "routeUpdate") {
- NavigationService.routeUpdate = value
- }
}
onRaiseApplicationWindow: {
@@ -260,11 +240,10 @@ StackView {
var isWidget = (WindowManager.windowProperty(item, "windowType") === "widget")
var isMapWidget = (WindowManager.windowProperty(item, "windowType") === "widgetMap")
var isClusterWidget = (WindowManager.windowProperty(item, "windowType") === "clusterWidget")
- var isPopup = (WindowManager.windowProperty(item, "windowType") === "popup")
print(":::LaunchController:::isClusterWidget", isClusterWidget)
print(":::LaunchController:::isWidget", isWidget, isMapWidget)
- if (!isMapWidget && !isClusterWidget && !isPopup) {
+ if (!isMapWidget && !isClusterWidget) {
WindowManager.setWindowProperty(item, "visibility", true)
WindowManager.setWindowProperty(item, "windowType", "fullScreen")
root.windowItem = item