X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreen%2Fsrc%2Flayouthandler.cpp;h=6aad54b12ea43c28e3a6a1db1f0f69083038d5a6;hb=505ec164e5174ddd838c0cac1e3e828930cb3b50;hp=80f6cd17f2d4d4881704de7bf424d89ef0850716;hpb=557bdea00ff9a398f0646fdcae653791c9cb640c;p=staging%2FHomeScreen.git diff --git a/HomeScreen/src/layouthandler.cpp b/HomeScreen/src/layouthandler.cpp index 80f6cd1..6aad54b 100644 --- a/HomeScreen/src/layouthandler.cpp +++ b/HomeScreen/src/layouthandler.cpp @@ -27,6 +27,13 @@ LayoutHandler::LayoutHandler(QObject *parent) : "/Popup", QDBusConnection::sessionBus(), 0); + + QDBusConnection::sessionBus().connect("org.agl.windowmanager", + "/windowmanager", + "org.agl.windowmanager", + "surfaceVisibilityChanged", + this, + SIGNAL(surfaceVisibilityChanged(int,bool))); } LayoutHandler::~LayoutHandler() @@ -117,12 +124,14 @@ void LayoutHandler::setUpLayouts() void LayoutHandler::showAppLayer() { - mp_dBusWindowManagerProxy->showLayer(1); //1==app layer + // POPUP=0, HOMESCREEN_OVERLAY=1, APPS=2, HOMESCREEN=3 + mp_dBusWindowManagerProxy->showLayer(2); // TODO: enum } void LayoutHandler::hideAppLayer() { - mp_dBusWindowManagerProxy->hideLayer(1); //1==app layer + // POPUP=0, HOMESCREEN_OVERLAY=1, APPS=2, HOMESCREEN=3 + mp_dBusWindowManagerProxy->hideLayer(2); // TODO: enum } void LayoutHandler::makeMeVisible(int pid) @@ -234,9 +243,16 @@ int LayoutHandler::requestGetSurfaceStatus(int surfaceId) return result; } -void LayoutHandler::requestRenderSurfaceToArea(int surfaceId, const QRect &renderArea) +void LayoutHandler::requestRenderSurfaceToArea(int surfaceId, int layoutArea) +{ + qDebug("requestRenderSurfaceToArea %d %d", surfaceId, layoutArea); +} + +bool LayoutHandler::requestRenderSurfaceToAreaAllowed(int surfaceId, int layoutArea) { - qDebug("requestRenderSurfaceToArea %d %d,%d,%d,%d", surfaceId, renderArea.x(), renderArea.y(), renderArea.width(), renderArea.height()); + qDebug("requestRenderSurfaceToAreaAllowed %d %d", surfaceId, layoutArea); + bool result = true; + return result; } void LayoutHandler::requestSurfaceIdToFullScreen(int surfaceId) @@ -258,6 +274,12 @@ void LayoutHandler::setLayoutByName(QString layoutName) } } +void LayoutHandler::requestSurfaceVisibilityChanged(int surfaceId, bool visible) +{ + qDebug("requestSurfaceVisibilityChanged %d %s", surfaceId, visible ? "true" : "false"); + emit surfaceVisibilityChanged(surfaceId, visible); +} + void LayoutHandler::timerEvent(QTimerEvent *e) { if (e->timerId() == m_secondsTimerId)