Add cancel touch method

Change-Id: If34b2aaacf4ef8001fc573fc5ad071949178c1ca
Signed-off-by: hyunho <hhstark.kang@samsung.com>

diff --git a/watch-holder/src/watch.cc b/watch-holder/src/watch.cc
index 32cd225..a83d847 100644 (file)
--- a/watch-holder/src/watch.cc
+++ b/watch-holder/src/watch.cc
@@ -73,6 +73,10 @@ void Watch::OnAuxMsg(void *data, Evas_Object *o, void *ev_info) {
        }
 }
 
+void Watch::CancelTouch() {
+  RemoteSurface::SendTouchCancel();
+}
+
 int Watch::GetRid() const {
   return RemoteSurface::GetRid();
 }

diff --git a/watch-holder/src/watch.hh b/watch-holder/src/watch.hh
index ffd04bb..5cde285 100644 (file)
--- a/watch-holder/src/watch.hh
+++ b/watch-holder/src/watch.hh
@@ -46,6 +46,7 @@ class EXPORT_API Watch : private screen_connector::RemoteSurfaceEvas,
   void Terminate();
   void Bind(Evas_Object* win);
   void Unbind();
+  void CancelTouch();
   Evas_Object* GetCurrentImage() const override;
   int NotifyChangedEvent() const;
   bool IsBound() override;
@@ -65,11 +66,11 @@ class EXPORT_API Watch : private screen_connector::RemoteSurfaceEvas,
   static void OnAuxMsg(void *data, Evas_Object *o, void *ev_info);
 
  private:
-  int pid_;
+  int pid_ = 0;
   std::string appid_;
   IEvent* listener_;
-  Evas_Object* current_image_;
-  Evas_Object* bind_win_;
+  Evas_Object* current_image_ = nullptr;
+  Evas_Object* bind_win_ = nullptr;
 };
 
 }  // namespace watch_holder