Code Review
/
staging
/
HomeScreen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Implement toggle full screen mechanism.
[staging/HomeScreen.git]
/
WindowManager
/
src
/
windowmanager.hpp
diff --git
a/WindowManager/src/windowmanager.hpp
b/WindowManager/src/windowmanager.hpp
index
8fb716d
..
ef19f4e
100644
(file)
--- a/
WindowManager/src/windowmanager.hpp
+++ b/
WindowManager/src/windowmanager.hpp
@@
-42,19
+42,24
@@
class WindowManager : public QObject
public:
explicit WindowManager(QObject *parent = 0);
public:
explicit WindowManager(QObject *parent = 0);
- QMutex callbackMutex;
-
~WindowManager();
~WindowManager();
+
+ void start();
private:
WindowmanagerAdaptor *mp_windowManagerAdaptor;
QMap<int, QList<SimpleRect> > m_layouts;
QMap<int, QString> m_layoutNames;
private:
WindowmanagerAdaptor *mp_windowManagerAdaptor;
QMap<int, QList<SimpleRect> > m_layouts;
QMap<int, QString> m_layoutNames;
+ QMap<int, bool> m_layoutFullScreen;
+ QMap<int, int> m_layoutFullScreenAssociated;
int m_currentLayout;
void dumpScene();
int m_currentLayout;
void dumpScene();
+ int m_homeScreenPid;
#ifdef __arm__
void createNewLayer(int layerId);
void addSurfaceToLayer(int surfaceId, int layerId);
#ifdef __arm__
void createNewLayer(int layerId);
void addSurfaceToLayer(int surfaceId, int layerId);
+ void updateScreen();
+
QMap<t_ilm_uint, SurfaceInfo> *mp_surfaces;
/* one layer per pid is created
QMap<t_ilm_uint, SurfaceInfo> *mp_surfaces;
/* one layer per pid is created
@@
-62,6
+67,8
@@
private:
QList<int> *mp_processLayers;
#endif
QList<int> *mp_processLayers;
#endif
+ QMap<int, unsigned int> *mp_layoutAreaToPidAssignment;
+
public:
static void* myThis;
public:
static void* myThis;
@@
-90,14
+97,16
@@
public slots:
// from windowmanager_adapter.h
public Q_SLOTS: // METHODS
// from windowmanager_adapter.h
public Q_SLOTS: // METHODS
- int addLayout(int layoutId, const QString &layoutName, const QList<SimpleRect> &surfaceAreas);
+ int addLayout(int layoutId, const QString &layoutName, bool isFullScreen, int associatedFullScreenLayout, const QList<SimpleRect> &surfaceAreas);
+ int getAssociatedFullScreenLayout(int layoutId);
QList<int> getAvailableLayouts(int numberOfAppSurfaces);
QList<SimplePoint> getAvailableSurfaces();
int getLayout();
QString getLayoutName(int layoutId);
QList<int> getAvailableLayouts(int numberOfAppSurfaces);
QList<SimplePoint> getAvailableSurfaces();
int getLayout();
QString getLayoutName(int layoutId);
+ bool isLayoutFullScreen(int layoutId);
void setLayoutById(int layoutId);
void setLayoutByName(const QString &layoutName);
void setLayoutById(int layoutId);
void setLayoutByName(const QString &layoutName);
- void set
SurfaceToLayoutArea(int surfaceI
d, int layoutAreaId);
+ void set
PidToLayoutArea(int pi
d, int layoutAreaId);
};
};