DSWindowShell: implements setType function

Change-Id: I53d65ce7fb04463554b2d88ded0cd7475e1fd9ca

diff --git a/src/DSWindowShell/DSWindowShell.cpp b/src/DSWindowShell/DSWindowShell.cpp
index 2bbbe33..cba4622 100644 (file)
--- a/src/DSWindowShell/DSWindowShell.cpp
+++ b/src/DSWindowShell/DSWindowShell.cpp
@@ -126,6 +126,8 @@ bool DSWindowShell::setSkipFocus(bool set)
 
 bool DSWindowShell::setPosition(int x, int y)
 {
+       DSLOG_DBG("DSWindowShell", "DSWindowShell:%p, Set Position (%d, %d)", this, x, y);
+
        DS_GET_PRIV(DSWindowShell);
        return priv->setPosition(x, y);
 }
@@ -139,14 +141,15 @@ stPosition DSWindowShell::getPosition(void)
 
 bool DSWindowShell::setSize(unsigned int w, unsigned int h)
 {
-       DS_GET_PRIV(DSWindowShell);
+       DSLOG_DBG("DSWindowShell", "DSWindowShell:%p, Set Size (%d, %d)", this, w, h);
 
+       DS_GET_PRIV(DSWindowShell);
        return priv->setSize(w, h);
 }
 
 bool DSWindowShell::setGeometry(int x, int y, unsigned int w, unsigned int h)
 {
-       DSLOG_DBG("DSWindowShell", "Set Geometry (%d, %d, %d, %d)", x, y, w, h);
+       DSLOG_DBG("DSWindowShell", "DSWindowShell:%p, Set Geometry (%d, %d, %d, %d)", this, x, y, w, h);
 
        DS_GET_PRIV(DSWindowShell);
        return priv->setGeometry(x, y, w, h);

diff --git a/src/DSWindowShell/DSWindowShellPrivate.cpp b/src/DSWindowShell/DSWindowShellPrivate.cpp
index 0187256..45233be 100644 (file)
--- a/src/DSWindowShell/DSWindowShellPrivate.cpp
+++ b/src/DSWindowShell/DSWindowShellPrivate.cpp
@@ -162,11 +162,11 @@ void DSWindowShellPrivate::__handleAuxHint(stWindowAuxHint *hint)
                else
                        set = false;
 
-               __handleUserGeometryHint(set);
+               __handleUserGeometryProperty(set);
        }
 }
 
-bool DSWindowShellPrivate::__handleUserGeometryHint(bool setUserGeometry)
+bool DSWindowShellPrivate::__handleUserGeometryProperty(bool setUserGeometry)
 {
        if (!__window) return false;
 
@@ -586,11 +586,20 @@ int  DSWindowShellPrivate::getIconicState(void)
 
 bool DSWindowShellPrivate::setType(int type)
 {
+       if (__window)
+               __window->setType(type);
+
+       if (type == 9) // utility
+               __handleUserGeometryProperty(true);
+
        return true;
 }
 
 int  DSWindowShellPrivate::getType(void)
 {
+       if (__window)
+               return __window->getType();
+
        return 0;
 }
 
@@ -650,8 +659,7 @@ bool DSWindowShellPrivate::getVkbdFloating()
 
 void DSWindowShellPrivate::setAllowUserGeometry(bool set)
 {
-       if (__window)
-               __window->allowUserGeometry(set);
+       __handleUserGeometryProperty(set);
 }
 
 

diff --git a/src/DSWindowShell/DSWindowShellPrivate.h b/src/DSWindowShell/DSWindowShellPrivate.h
index d9d864c..d882d40 100644 (file)
--- a/src/DSWindowShell/DSWindowShellPrivate.h
+++ b/src/DSWindowShell/DSWindowShellPrivate.h
@@ -130,7 +130,7 @@ private:
 
        struct stWindowAuxHint* __findAuxHint(int32_t id);
        void __handleAuxHint(stWindowAuxHint *hint);
-       bool __handleUserGeometryHint(bool setUserGeometry);
+       bool __handleUserGeometryProperty(bool setUserGeometry);
 
        void __onWindowBufferChanged(std::shared_ptr<IDSBuffer> buffer);