From 34d5e5b4ccf8ba0f779b78a8321066a136a87cc6 Mon Sep 17 00:00:00 2001 From: Syed Khaja Moinuddin Date: Tue, 16 Apr 2013 22:43:29 +0900 Subject: [PATCH] Fixed N_SE-34752 in EditDate & EditTime Signed-off-by: Syed Khaja Moinuddin Change-Id: Ie3db57140fe4e24818fc63e97205b88071c4202c --- src/ui/controls/FUiCtrl_EditDate.cpp | 15 +++++++-------- src/ui/controls/FUiCtrl_EditTime.cpp | 15 +++++++-------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/ui/controls/FUiCtrl_EditDate.cpp b/src/ui/controls/FUiCtrl_EditDate.cpp index b41ef52..14cb340 100644 --- a/src/ui/controls/FUiCtrl_EditDate.cpp +++ b/src/ui/controls/FUiCtrl_EditDate.cpp @@ -773,7 +773,6 @@ _EditDate::OnChangeLayout(_ControlOrientation orientation) if (GetDateTimeBar() != null) { - CalculateDateTimeBarPosition(); GetDateTimeBar()->SetVisibleState(false); GetDateTimeBar()->Close(); } @@ -784,21 +783,21 @@ _EditDate::OnChangeLayout(_ControlOrientation orientation) bool _EditDate::OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo) { - FloatRectangle absoluteBounds = GetAbsoluteBoundsF(); - SetFocused(true); - if (absoluteBounds.y != __absoluteBounds.y || absoluteBounds.height != __absoluteBounds.height) - { - CalculateDateTimeBarPosition(); - } - 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) + { + CalculateDateTimeBarPosition(); + } + return __pEditDatePresenter->OnTouchReleased(source, touchinfo); } diff --git a/src/ui/controls/FUiCtrl_EditTime.cpp b/src/ui/controls/FUiCtrl_EditTime.cpp index 2433104..8b38ee1 100644 --- a/src/ui/controls/FUiCtrl_EditTime.cpp +++ b/src/ui/controls/FUiCtrl_EditTime.cpp @@ -566,7 +566,6 @@ _EditTime::OnChangeLayout(_ControlOrientation orientation) if (GetDateTimeBar() != null) { - CalculateDateTimeBarPosition(); GetDateTimeBar()->SetVisibleState(false); GetDateTimeBar()->Close(); } @@ -577,21 +576,21 @@ _EditTime::OnChangeLayout(_ControlOrientation orientation) bool _EditTime::OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo) { - FloatRectangle absoluteBounds = GetAbsoluteBoundsF(); - SetFocused(true); - if (absoluteBounds.y != __absoluteBounds.y || absoluteBounds.height != __absoluteBounds.height) - { - CalculateDateTimeBarPosition(); - } - 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->OnTouchReleased(source, touchinfo); } -- 2.7.4