diff options
author | Bocklage, Jens <Jens_Bocklage@mentor.com> | 2016-11-04 17:23:02 +0100 |
---|---|---|
committer | Bocklage, Jens <Jens_Bocklage@mentor.com> | 2016-11-04 17:23:02 +0100 |
commit | bf0f33bec5ad705666dff6c821334524c1b81583 (patch) | |
tree | c9544663e1ca3bacbbd23113b227a77526f4b0fc /HomeScreen | |
parent | ec688535558c31989e7da221b858328b2e0766c8 (diff) |
Fix for pid and surface handling.
Signed-off-by: Bocklage, Jens <Jens_Bocklage@mentor.com>
Diffstat (limited to 'HomeScreen')
-rw-r--r-- | HomeScreen/src/layouthandler.cpp | 88 | ||||
-rw-r--r-- | HomeScreen/src/layouthandler.h | 2 |
2 files changed, 48 insertions, 42 deletions
diff --git a/HomeScreen/src/layouthandler.cpp b/HomeScreen/src/layouthandler.cpp index 0dac24f..5f52cd5 100644 --- a/HomeScreen/src/layouthandler.cpp +++ b/HomeScreen/src/layouthandler.cpp @@ -112,60 +112,66 @@ void LayoutHandler::setUpLayouts() mp_dBusWindowManagerProxy->addLayout(3, "side by side", surfaceAreas); } -void LayoutHandler::makeMeVisible(int surfaceId) +void LayoutHandler::makeMeVisible(int pid) { - qDebug("makeMeVisible %d", surfaceId); - m_requestsToBeVisibleSurfaces.append(surfaceId); + qDebug("makeMeVisible %d", pid); - qDebug("m_visibleSurfaces %d", m_visibleSurfaces.size()); - qDebug("m_invisibleSurfaces %d", m_invisibleSurfaces.size()); - qDebug("m_requestsToBeVisibleSurfaces %d", m_requestsToBeVisibleSurfaces.size()); + QList<int> allSurfaces = mp_dBusWindowManagerProxy->getAllSurfacesOfProcess(pid); + qSort(allSurfaces); - QList<int> availableLayouts = mp_dBusWindowManagerProxy->getAvailableLayouts(m_visibleSurfaces.size() + m_requestsToBeVisibleSurfaces.size()); - if (0 == availableLayouts.size()) + if (0 != allSurfaces.size()) { - // no layout fits the need! - // replace the last app - qDebug("no layout fits the need!"); - qDebug("replace the last surface"); + m_requestsToBeVisibleSurfaces.append(allSurfaces.at(0)); - m_invisibleSurfaces.append(m_visibleSurfaces.last()); - m_visibleSurfaces.removeLast(); + qDebug("m_visibleSurfaces %d", m_visibleSurfaces.size()); + qDebug("m_invisibleSurfaces %d", m_invisibleSurfaces.size()); + qDebug("m_requestsToBeVisibleSurfaces %d", m_requestsToBeVisibleSurfaces.size()); - m_visibleSurfaces.append(m_requestsToBeVisibleSurfaces); - m_requestsToBeVisibleSurfaces.clear(); - - for (int i = 0; i < m_visibleSurfaces.size(); ++i) + QList<int> availableLayouts = mp_dBusWindowManagerProxy->getAvailableLayouts(m_visibleSurfaces.size() + m_requestsToBeVisibleSurfaces.size()); + if (0 == availableLayouts.size()) { - mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(m_visibleSurfaces.at(i), i); - } - } - if (1 == availableLayouts.size()) - { - // switch to new layout - qDebug("switch to new layout %d", availableLayouts.at(0)); - m_visibleSurfaces.append(m_requestsToBeVisibleSurfaces); - m_requestsToBeVisibleSurfaces.clear(); + // no layout fits the need! + // replace the last app + qDebug("no layout fits the need!"); + qDebug("replace the last surface"); - mp_dBusWindowManagerProxy->setLayoutById(availableLayouts.at(0)); - for (int i = 0; i < m_visibleSurfaces.size(); ++i) - { - mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(m_visibleSurfaces.at(i), i); - } - } - if (1 < availableLayouts.size()) - { - // more than one layout possible! Ask user. - qDebug("more than one layout possible! Ask user."); + m_invisibleSurfaces.append(m_visibleSurfaces.last()); + m_visibleSurfaces.removeLast(); + + m_visibleSurfaces.append(m_requestsToBeVisibleSurfaces); + m_requestsToBeVisibleSurfaces.clear(); - QStringList choices; - for (int i = 0; i < availableLayouts.size(); ++i) + for (int i = 0; i < m_visibleSurfaces.size(); ++i) + { + mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(m_visibleSurfaces.at(i), i); + } + } + if (1 == availableLayouts.size()) { - choices.append(mp_dBusWindowManagerProxy->getLayoutName(availableLayouts.at(i))); + // switch to new layout + qDebug("switch to new layout %d", availableLayouts.at(0)); + m_visibleSurfaces.append(m_requestsToBeVisibleSurfaces); + m_requestsToBeVisibleSurfaces.clear(); + + mp_dBusWindowManagerProxy->setLayoutById(availableLayouts.at(0)); + for (int i = 0; i < m_visibleSurfaces.size(); ++i) + { + mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(m_visibleSurfaces.at(i), i); + } } + if (1 < availableLayouts.size()) + { + // more than one layout possible! Ask user. + qDebug("more than one layout possible! Ask user."); - mp_dBusPopupProxy->showPopupComboBox("Select Layout", choices); + QStringList choices; + for (int i = 0; i < availableLayouts.size(); ++i) + { + choices.append(mp_dBusWindowManagerProxy->getLayoutName(availableLayouts.at(i))); + } + mp_dBusPopupProxy->showPopupComboBox("Select Layout", choices); + } } } diff --git a/HomeScreen/src/layouthandler.h b/HomeScreen/src/layouthandler.h index ee400b7..cc4b7ab 100644 --- a/HomeScreen/src/layouthandler.h +++ b/HomeScreen/src/layouthandler.h @@ -17,7 +17,7 @@ public: signals: public slots: - void makeMeVisible(int surfaceId); + void makeMeVisible(int pid); void requestRenderSurfaceToArea(int surfaceId, const QRect &renderArea); void requestSurfaceIdToFullScreen(int surfaceId); |