X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=WindowManager%2Fsrc%2Fwindowmanager.hpp;h=26fe8ea1408a57bfa819baddcdfa7f049f746d2f;hb=ffad9fd5bed339b7ae3bd8086f1c90ce1b6dc69b;hp=027344bee0561ca0a794d2475db9df565c64af70;hpb=9ca0a50d021a8d6e12cfb8f04671ba3dd389f92d;p=staging%2FHomeScreen.git diff --git a/WindowManager/src/windowmanager.hpp b/WindowManager/src/windowmanager.hpp index 027344b..26fe8ea 100644 --- a/WindowManager/src/windowmanager.hpp +++ b/WindowManager/src/windowmanager.hpp @@ -21,12 +21,12 @@ #include #include -#include "windowmanager_adapter.h" +#include "windowmanager_adaptor.h" -#ifdef __arm__ +#ifdef HAVE_IVI_LAYERMANAGEMENT_API extern "C" { -#include "ilm/ilm_control.h" +#include } #endif @@ -46,12 +46,10 @@ private: QMap *mp_layoutAreaToSurfaceIdAssignment; int m_currentLayout; - int m_homeScreenPid; - int m_homeScreenSurfaceId; void dumpScene(); -#ifdef __arm__ +#ifdef HAVE_IVI_LAYERMANAGEMENT_API void createNewLayer(int layerId); void addSurfaceToLayer(int surfaceId, int layerId); #endif @@ -61,7 +59,7 @@ private: public: static void* myThis; -#ifdef __arm__ +#ifdef HAVE_IVI_LAYERMANAGEMENT_API // for general notifications void notificationFunc_non_static(ilmObjectType object, t_ilm_uint id, @@ -84,12 +82,8 @@ public: public slots: -// from windowmanager_adapter.h +// from windowmanager_adaptor.h public: // PROPERTIES - Q_PROPERTY(int homeScreenPid READ homeScreenPid WRITE setHomeScreenPid) - int homeScreenPid() const; - void setHomeScreenPid(int value); - Q_PROPERTY(int layoutId READ layoutId) int layoutId() const; @@ -98,13 +92,20 @@ public: // PROPERTIES public Q_SLOTS: // METHODS int addLayout(int layoutId, const QString &layoutName, const QList &surfaceAreas); + int deleteLayoutById(int layoutId); QList getAllLayouts(); + QList getAllSurfacesOfProcess(int pid); QList getAvailableLayouts(int numberOfAppSurfaces); QList getAvailableSurfaces(); QString getLayoutName(int layoutId); + void hideLayer(int layer); int setLayoutById(int layoutId); int setLayoutByName(const QString &layoutName); int setSurfaceToLayoutArea(int surfaceId, int layoutAreaId); + void showLayer(int layer); + +Q_SIGNALS: // SIGNALS + void surfaceVisibilityChanged(int surfaceId, bool visible); };