diff options
| author |   Bocklage, Jens <Jens_Bocklage@mentor.com> | 2016-12-16 13:47:25 +0100 |
|---|---|---|
| committer | Bocklage, Jens <Jens_Bocklage@mentor.com> | 2016-12-16 13:47:25 +0100 |
| commit | 36f4818cb31b406715ec0d52a2075611ec6fcdff (patch) | |
| tree | 1dbe16bbf7c16c83c7e0b9bf00bfdfd82fc61497 | |
| parent | a8414c772521b330d950dedc7f5b25f8ebff6e23 (diff) | |
Make compilable on non HAVE_IVI_LAYERMANAGEMENT_API systems
No functional changes
Signed-off-by: Bocklage, Jens <Jens_Bocklage@mentor.com>
| -rw-r--r-- | WindowManager/src/windowmanager.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/WindowManager/src/windowmanager.cpp b/WindowManager/src/windowmanager.cpp index 84f467d..101f5b3 100644 --- a/WindowManager/src/windowmanager.cpp +++ b/WindowManager/src/windowmanager.cpp @@ -48,10 +48,14 @@ WindowManager::WindowManager(QObject *parent) : m_currentLayout(-1), m_screenId(0), // use screen "0" m_screenWidth(0), - m_screenHeight(0), + m_screenHeight(0) +#ifdef HAVE_IVI_LAYERMANAGEMENT_API + , m_appLayers(), m_pending_to_show(-1) +#endif { +#ifdef HAVE_IVI_LAYERMANAGEMENT_API m_showLayers = new t_ilm_layer[WINDOWMANAGER_LAYER_NUM]; m_showLayers[0] = 0; /* POPUP is not shown by default */ @@ -59,6 +63,7 @@ WindowManager::WindowManager(QObject *parent) : m_showLayers[2] = 0; /* APPLICATIONS is not shown by default */ m_showLayers[3] = WINDOWMANAGER_LAYER_HOMESCREEN; /* HOMESCREEN is shwon by default */ +#endif qDebug("-=[WindowManager]=-"); } @@ -107,6 +112,7 @@ WindowManager::~WindowManager() delete mp_layoutAreaToSurfaceIdAssignment; } +#ifdef HAVE_IVI_LAYERMANAGEMENT_API int WindowManager::getLayerRenderOrder(t_ilm_layer id_array[]) { int i, j; @@ -119,6 +125,7 @@ int WindowManager::getLayerRenderOrder(t_ilm_layer id_array[]) return j; } +#endif void WindowManager::dumpScene() { @@ -347,6 +354,7 @@ void WindowManager::updateScreen() ilm_layerSetRenderOrder(WINDOWMANAGER_LAYER_POPUP, pArray, length); ilm_commitChanges(); #endif +#ifdef HAVE_IVI_LAYERMANAGEMENT_API if (m_pending_to_show != -1) { showAppLayer(m_pending_to_show); } else { @@ -356,6 +364,7 @@ void WindowManager::updateScreen() ilm_displaySetRenderOrder(m_screenId, renderOrder, num_layers); ilm_commitChanges(); } +#endif } #ifdef HAVE_IVI_LAYERMANAGEMENT_API @@ -782,11 +791,11 @@ void WindowManager::showAppLayer(int pid) /* nothing to show */ return; } +#ifdef HAVE_IVI_LAYERMANAGEMENT_API /* clear pending flag */ m_pending_to_show = -1; -#ifdef HAVE_IVI_LAYERMANAGEMENT_API /* search layer id for application to show */ QMap<pid_t, t_ilm_layer>::const_iterator i = m_appLayers.find(pid); |