From a8414c772521b330d950dedc7f5b25f8ebff6e23 Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Thu, 15 Dec 2016 15:51:13 +0900 Subject: [PATCH] Fix management of screen WindowManager can support signle screen only, so far. CAUTION: To apply this change for porter board, LVDS-1 output should be disabled first. (see Changes 7637 for detail) https://gerrit.automotivelinux.org/gerrit/#/c/7637/ Signed-off-by: Tadao Tanikawa --- WindowManager/src/windowmanager.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/WindowManager/src/windowmanager.cpp b/WindowManager/src/windowmanager.cpp index c3080ff..84f467d 100644 --- a/WindowManager/src/windowmanager.cpp +++ b/WindowManager/src/windowmanager.cpp @@ -353,8 +353,7 @@ void WindowManager::updateScreen() // display layer render order t_ilm_layer renderOrder[WINDOWMANAGER_LAYER_NUM]; int num_layers = getLayerRenderOrder(renderOrder); - ilm_displaySetRenderOrder(0, renderOrder, num_layers); - ilm_displaySetRenderOrder(1, renderOrder, num_layers); + ilm_displaySetRenderOrder(m_screenId, renderOrder, num_layers); ilm_commitChanges(); } } @@ -449,6 +448,7 @@ void WindowManager::surfaceCallbackFunction_non_static(t_ilm_surface surface, { qDebug("ILM_NOTIFICATION_CONTENT_AVAILABLE"); /* add surface to layer for the application */ + ilmErrorTypes result; pid_t pid = surfaceProperties->creatorPid; @@ -689,8 +689,7 @@ void WindowManager::hideLayer(int layer) t_ilm_layer renderOrder[WINDOWMANAGER_LAYER_NUM]; int num_layers = getLayerRenderOrder(renderOrder); - ilm_displaySetRenderOrder(0, renderOrder, num_layers); - ilm_displaySetRenderOrder(1, renderOrder, num_layers); + ilm_displaySetRenderOrder(m_screenId, renderOrder, num_layers); ilm_commitChanges(); } #endif @@ -768,8 +767,7 @@ void WindowManager::showLayer(int layer) t_ilm_layer renderOrder[WINDOWMANAGER_LAYER_NUM]; int num_layers = getLayerRenderOrder(renderOrder); - ilm_displaySetRenderOrder(0, renderOrder, num_layers); - ilm_displaySetRenderOrder(1, renderOrder, num_layers); + ilm_displaySetRenderOrder(m_screenId, renderOrder, num_layers); ilm_commitChanges(); } #endif @@ -806,8 +804,7 @@ void WindowManager::showAppLayer(int pid) t_ilm_layer renderOrder[WINDOWMANAGER_LAYER_NUM]; int num_layers = getLayerRenderOrder(renderOrder); - ilm_displaySetRenderOrder(0, renderOrder, num_layers); - ilm_displaySetRenderOrder(1, renderOrder, num_layers); + ilm_displaySetRenderOrder(m_screenId, renderOrder, num_layers); ilm_commitChanges(); #endif } -- 2.16.6