DSWindowShell: add unsetFocus()

Change-Id: I8e9221fdd893e2ec0372621ef77be0f51522ddf6
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>

diff --git a/src/DSWindowShell/DSWindowShell.cpp b/src/DSWindowShell/DSWindowShell.cpp
index a7c1550..357f5d1 100644 (file)
--- a/src/DSWindowShell/DSWindowShell.cpp
+++ b/src/DSWindowShell/DSWindowShell.cpp
@@ -162,6 +162,12 @@ bool DSWindowShell::lower(void)
        return priv->lower();
 }
 
+bool DSWindowShell::unsetFocus(void)
+{
+       DS_GET_PRIV(DSWindowShell);
+
+       return priv->unsetFocus();
+}
 
 bool DSWindowShell::setFocus(void)
 {

diff --git a/src/DSWindowShell/DSWindowShell.h b/src/DSWindowShell/DSWindowShell.h
index 435d0ce..c0aa944 100644 (file)
--- a/src/DSWindowShell/DSWindowShell.h
+++ b/src/DSWindowShell/DSWindowShell.h
@@ -72,6 +72,7 @@ public:
        bool raise(void);
        bool lower(void);
 
+       bool unsetFocus(void);
        bool setFocus(void);
        bool isFocused(void);
 

diff --git a/src/DSWindowShell/DSWindowShellPrivate.cpp b/src/DSWindowShell/DSWindowShellPrivate.cpp
index dab6105..62dcd98 100644 (file)
--- a/src/DSWindowShell/DSWindowShellPrivate.cpp
+++ b/src/DSWindowShell/DSWindowShellPrivate.cpp
@@ -203,15 +203,25 @@ bool DSWindowShellPrivate::lower(void)
        return true;
 }
 
+bool DSWindowShellPrivate::unsetFocus(void)
+{
+       if (__window)
+               return __window->unsetFocus();
+       return false;
+}
 
 bool DSWindowShellPrivate::setFocus(void)
 {
-       return true;
+       if (__window)
+               return __window->setFocus();
+       return false;
 }
 
 bool DSWindowShellPrivate::isFocused(void)
 {
-       return true;
+       if (__window)
+               return __window->hasFocus();
+       return false;
 }
 
 

diff --git a/src/DSWindowShell/DSWindowShellPrivate.h b/src/DSWindowShell/DSWindowShellPrivate.h
index d2c6273..77582d1 100644 (file)
--- a/src/DSWindowShell/DSWindowShellPrivate.h
+++ b/src/DSWindowShell/DSWindowShellPrivate.h
@@ -68,6 +68,7 @@ public:
        bool raise(void);
        bool lower(void);
 
+       bool unsetFocus(void);
        bool setFocus(void);
        bool isFocused(void);
 

diff --git a/tests/DSWindowShell-test.cpp b/tests/DSWindowShell-test.cpp
index dcd84ce..73af28c 100644 (file)
--- a/tests/DSWindowShell-test.cpp
+++ b/tests/DSWindowShell-test.cpp
@@ -213,6 +213,19 @@ TEST_F(DSWindowShellTest, isFocused_P1)
        EXPECT_TRUE(shell->isFocused() == true);
 }
 
+TEST_F(DSWindowShellTest, unsetFocus)
+{
+       auto window = std::make_shared<DSWindow>();
+       std::unique_ptr<DSWindowShell> shell = std::make_unique<DSWindowShell>(window.get());
+       EXPECT_TRUE(shell != nullptr);
+
+       EXPECT_TRUE(shell->create(0, 0, 720, 1280, nullptr) == true);
+       EXPECT_TRUE(shell->setFocus() == true);
+       EXPECT_TRUE(shell->isFocused() == true);
+       EXPECT_TRUE(shell->unsetFocus() == true);
+       EXPECT_TRUE(shell->isFocused() != true);
+}
+
 TEST_F(DSWindowShellTest, activate_P1)
 {
        auto window = std::make_shared<DSWindow>();