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
Improve layer- and surface handling
[staging/HomeScreen.git]
/
WindowManager
/
src
/
windowmanager.hpp
diff --git
a/WindowManager/src/windowmanager.hpp
b/WindowManager/src/windowmanager.hpp
index
26fe8ea
..
7358412
100644
(file)
--- a/
WindowManager/src/windowmanager.hpp
+++ b/
WindowManager/src/windowmanager.hpp
@@
-25,9
+25,7
@@
#ifdef HAVE_IVI_LAYERMANAGEMENT_API
#ifdef HAVE_IVI_LAYERMANAGEMENT_API
-extern "C" {
#include <ilm/ilm_control.h>
#include <ilm/ilm_control.h>
-}
#endif
class WindowManager : public QObject
#endif
class WindowManager : public QObject
@@
-42,11
+40,15
@@
public:
private:
WindowmanagerAdaptor *mp_windowManagerAdaptor;
QList<Layout> m_layouts;
private:
WindowmanagerAdaptor *mp_windowManagerAdaptor;
QList<Layout> m_layouts;
- QList<int> m_
s
urfaces;
+ QList<int> m_
appS
urfaces;
QMap<int, unsigned int> *mp_layoutAreaToSurfaceIdAssignment;
int m_currentLayout;
QMap<int, unsigned int> *mp_layoutAreaToSurfaceIdAssignment;
int m_currentLayout;
+ int m_screenId;
+ unsigned int m_screenWidth;
+ unsigned int m_screenHeight;
+
void dumpScene();
#ifdef HAVE_IVI_LAYERMANAGEMENT_API
void dumpScene();
#ifdef HAVE_IVI_LAYERMANAGEMENT_API