Fix flick gesture

Change-Id: I508ff170671633204877bbc8c9f024b6821e3ab4
Signed-off-by: HeeJu Kang <mobum.kang@samsung.com>

diff --git a/project/inc/ViewForm.h b/project/inc/ViewForm.h
index d7d03f0..34e14bc 100644 (file)
--- a/project/inc/ViewForm.h
+++ b/project/inc/ViewForm.h
@@ -41,12 +41,12 @@ public:
        bool Initialize();
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
-       virtual bool OnTouchPressed(Control& source, const Tizen::Ui::TouchEventInfo& touchEventInfo){}
-       virtual bool OnTouchReleased(Control& source, const Tizen::Ui::TouchEventInfo& touchEventInfo){}
-       virtual bool OnTouchMoved(Control& source, const Tizen::Ui::TouchEventInfo& touchEventInfo){}
-       virtual bool OnTouchCanceled(Control& source, const Tizen::Ui::TouchEventInfo& touchEventInfo){}
+       virtual bool OnTouchPressed(Control& source, const Tizen::Ui::TouchEventInfo& touchEventInfo);
+       virtual bool OnTouchReleased(Control& source, const Tizen::Ui::TouchEventInfo& touchEventInfo);
+       virtual bool OnTouchMoved(Control& source, const Tizen::Ui::TouchEventInfo& touchEventInfo);
+       virtual bool OnTouchCanceled(Control& source, const Tizen::Ui::TouchEventInfo& touchEventInfo);
        virtual bool OnPreviewTouchPressed(Control& source, const Tizen::Ui::TouchEventInfo& touchEventInfo);
-       virtual bool OnPreviewTouchReleased(Control& source, const Tizen::Ui::TouchEventInfo& touchEventInfo){}
+       virtual bool OnPreviewTouchReleased(Control& source, const Tizen::Ui::TouchEventInfo& touchEventInfo);
        virtual bool OnPreviewTouchMoved(Control& source, const Tizen::Ui::TouchEventInfo& touchEventInfo);
 
 private:

diff --git a/project/src/ViewForm.cpp b/project/src/ViewForm.cpp
index 5f28a3c..f94f419 100644 (file)
--- a/project/src/ViewForm.cpp
+++ b/project/src/ViewForm.cpp
@@ -294,15 +294,53 @@ ViewForm::OnAppWidgetProviderRemoved(Tizen::Shell::AppWidgetView &appWidgetView)
 }
 
 bool
+ViewForm::OnTouchPressed(Control& source, const Tizen::Ui::TouchEventInfo& touchEventInfo)
+{
+       return false;
+}
+
+bool
+ViewForm::OnTouchReleased(Control& source, const Tizen::Ui::TouchEventInfo& touchEventInfo)
+{
+       return false;
+}
+
+bool
+ViewForm::OnTouchMoved(Control& source, const Tizen::Ui::TouchEventInfo& touchEventInfo)
+{
+       return false;
+}
+
+bool
+ViewForm::OnTouchCanceled(Control& source, const Tizen::Ui::TouchEventInfo& touchEventInfo)
+{
+       return false;
+}
+
+bool
 ViewForm::OnPreviewTouchPressed(Control& source, const TouchEventInfo& touchEventInfo)
 {
        Point curPos(touchEventInfo.GetCurrentPosition().x,touchEventInfo.GetCurrentPosition().y);
-       if (&source == __pAppWidgetView)
+       if (&source == __pAppWidgetView && __isMoveMode == true)
        {
                __prevX = curPos.x;
                __prevY = curPos.y;
+
+               return true;
        }
-       return true;
+
+       return false;
+       }
+
+bool
+ViewForm::OnPreviewTouchReleased(Control& source, const Tizen::Ui::TouchEventInfo& touchEventInfo)
+{
+       if (&source == __pAppWidgetView && __isMoveMode == true)
+       {
+               return true;
+       }
+
+       return false;
 }
 
 bool
@@ -342,11 +380,9 @@ ViewForm::OnPreviewTouchMoved(Control& source, const TouchEventInfo& touchEventI
                __pAppWidgetView->SetPosition(newX, newY);
                __prevX = curPos.x;
                __prevY = curPos.y;
+
                return true;
        }
-       else
-       {
-               return false;
-       }
 
+       return false;
 }