Fixed some bug in EditDate / EditTime

Signe-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: I7bf559381a15b5e4b728f2b5f01aa33bf58207d8
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_EditDate.cpp b/src/ui/controls/FUiCtrl_EditDate.cpp
index a37b1d5..6573220 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditDate.cpp
+++ b/src/ui/controls/FUiCtrl_EditDate.cpp
@@ -785,12 +785,6 @@ _EditDate::OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo)
 {
        SetFocused(true);
 
-       return __pEditDatePresenter->OnTouchPressed(source, touchinfo);
-}
-
-bool
-_EditDate::OnTouchReleased(const _Control& source, const _TouchInfo& touchinfo)
-{
        FloatRectangle absoluteBounds = GetAbsoluteBoundsF();
 
        if (absoluteBounds.y != __absoluteBounds.y || absoluteBounds.height != __absoluteBounds.height)
@@ -798,6 +792,12 @@ _EditDate::OnTouchReleased(const _Control& source, const _TouchInfo& touchinfo)
                CalculateDateTimeBarPosition();
        }
 
+       return __pEditDatePresenter->OnTouchPressed(source, touchinfo);
+}
+
+bool
+_EditDate::OnTouchReleased(const _Control& source, const _TouchInfo& touchinfo)
+{
        return __pEditDatePresenter->OnTouchReleased(source, touchinfo);
 }
 

diff --git a/src/ui/controls/FUiCtrl_EditTime.cpp b/src/ui/controls/FUiCtrl_EditTime.cpp
index 42d513a..e7ad78d 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditTime.cpp
+++ b/src/ui/controls/FUiCtrl_EditTime.cpp
@@ -578,19 +578,18 @@ _EditTime::OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo)
 {
        SetFocused(true);
 
-       return __pEditTimePresenter->OnTouchPressed(source, touchinfo);
-}
-
-bool
-_EditTime::OnTouchReleased(const _Control& source, const _TouchInfo& touchinfo)
-{
        FloatRectangle absoluteBounds = GetAbsoluteBoundsF();
-
        if (absoluteBounds.y != __absoluteBounds.y || absoluteBounds.height != __absoluteBounds.height)
        {
                CalculateDateTimeBarPosition();
        }
 
+       return __pEditTimePresenter->OnTouchPressed(source, touchinfo);
+}
+
+bool
+_EditTime::OnTouchReleased(const _Control& source, const _TouchInfo& touchinfo)
+{
        return __pEditTimePresenter->OnTouchReleased(source, touchinfo);
 }