From f1de82b82538e143bd46fd216ccc62e1f1b0f983 Mon Sep 17 00:00:00 2001 From: "Bocklage, Jens" Date: Thu, 3 Nov 2016 13:47:46 +0100 Subject: [PATCH] HomeScreen is now visible independent of the Layout set. Signed-off-by: Bocklage, Jens --- WindowManager/src/windowmanager.cpp | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/WindowManager/src/windowmanager.cpp b/WindowManager/src/windowmanager.cpp index e4d5610..26d650f 100644 --- a/WindowManager/src/windowmanager.cpp +++ b/WindowManager/src/windowmanager.cpp @@ -147,6 +147,11 @@ void WindowManager::addSurfaceToLayer(int surfaceId, int layerId) struct ilmSurfaceProperties surfaceProperties; ilm_getPropertiesOfSurface(surfaceId, &surfaceProperties); + qDebug("sourceX %d", surfaceProperties.sourceX); + qDebug("sourceY %d", surfaceProperties.sourceY); + qDebug("sourceWidth %d", surfaceProperties.sourceWidth); + qDebug("sourceHeight %d", surfaceProperties.sourceHeight); + // homescreen app always fullscreen in the back t_ilm_uint screenID = 0; t_ilm_uint width; @@ -197,14 +202,9 @@ void WindowManager::updateScreen() { qDebug("-=[updateScreen]=-"); +#ifdef __arm__ if (-1 != m_currentLayout) { -#ifdef __arm__ - - t_ilm_layer renderOrder[WINDOWMANAGER_LAYER_NUM]; - renderOrder[0] = WINDOWMANAGER_LAYER_HOMESCREEN; - renderOrder[1] = WINDOWMANAGER_LAYER_APPLICATIONS; - renderOrder[2] = WINDOWMANAGER_LAYER_POPUP; // hide all surfaces for (int i = 0; i < m_surfaces.size(); ++i) @@ -249,11 +249,19 @@ void WindowManager::updateScreen() currentLayout.layoutAreas[j].height); } - ilm_displaySetRenderOrder(0, renderOrder, WINDOWMANAGER_LAYER_NUM); - ilm_commitChanges(); -#endif } + + t_ilm_layer renderOrder[WINDOWMANAGER_LAYER_NUM]; + renderOrder[0] = WINDOWMANAGER_LAYER_HOMESCREEN; + renderOrder[1] = WINDOWMANAGER_LAYER_APPLICATIONS; + renderOrder[2] = WINDOWMANAGER_LAYER_POPUP; + + ilm_displaySetRenderOrder(0, renderOrder, WINDOWMANAGER_LAYER_NUM); + + ilm_commitChanges(); + +#endif } #ifdef __arm__ -- 2.16.6