DSTouch: add resetFocus(), fix setFocus()

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

diff --git a/src/DSSeat/DSTouch.cpp b/src/DSSeat/DSTouch.cpp
index 00f8abc..c636dd7 100644 (file)
--- a/src/DSSeat/DSTouch.cpp
+++ b/src/DSSeat/DSTouch.cpp
@@ -108,6 +108,9 @@ void DSTouch::setFocus(std::shared_ptr<DSWindow> window)
        if (!window)
        {
                DSLOG_ERR("DSTouch", "Given window is INVALID. (window : %p)", window);
+               __touchFocus = window;
+               if (__dswlTouch)
+                       __dswlTouch->setFocus(nullptr);
                return;
        }
 
@@ -131,6 +134,18 @@ void DSTouch::setFocus(std::shared_ptr<DSWindow> window)
        __dswlTouch->setFocus(waylandSurface);
 }
 
+void DSTouch::resetFocus()
+{
+       if (__touchFocus)
+       {
+               __touchFocus = nullptr;
+               DSLOG_INF("DSTouch", "touchFocus has been reset.");
+       }
+
+       if (__dswlTouch)
+               __dswlTouch->resetFocus();
+}
+
 std::shared_ptr<DSWindow> DSTouch::getFocus()
 {
        return __touchFocus;

diff --git a/src/DSSeat/DSTouch.h b/src/DSSeat/DSTouch.h
index 99c8d7a..ef164d9 100644 (file)
--- a/src/DSSeat/DSTouch.h
+++ b/src/DSSeat/DSTouch.h
@@ -49,6 +49,7 @@ public:
        void touchUp(int32_t id);
        void touchMove(int32_t id, int x, int y);
        void setFocus(std::shared_ptr<DSWindow> window);
+       void resetFocus();
        std::shared_ptr<DSWindow> getFocus();
 
 private: