Fixed N_SE-35894 in EditDate / EDitTime

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

diff --git a/src/ui/controls/FUiCtrl_EditDate.cpp b/src/ui/controls/FUiCtrl_EditDate.cpp
index d456513..6f04183 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditDate.cpp
+++ b/src/ui/controls/FUiCtrl_EditDate.cpp
@@ -664,9 +664,14 @@ _EditDate::CalculateDateTimeBarPosition(void)
 void
 _EditDate::OnDraw(void)
 {
-       if (GetDateTimeBar() != null && GetDateTimeBar()->IsActivated())
+       if (GetDateTimeBar() != null)
        {
-               CalculateDateTimeBarPosition();
+               FloatRectangle absoluteBounds = GetAbsoluteBoundsF();
+
+               if (absoluteBounds.y != __absoluteBounds.y || absoluteBounds.height != __absoluteBounds.height)
+               {
+                       CalculateDateTimeBarPosition();
+               }
        }
 
        __pEditDatePresenter->Draw();

diff --git a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp
index 6f48d5d..0e964d5 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp
@@ -661,7 +661,7 @@ _EditDatePresenter::DrawText(Canvas& canvas, const FloatRectangle& bounds, const
 
        (_FontImpl::GetInstance(*__pFont))->SetStyle(FONT_STYLE_PLAIN);
 
-       if (boxId == __selectedId && boxId != DATETIME_ID_NONE)
+       if (boxId == GetLastSelectedId() && boxId != DATETIME_ID_NONE)
        {
                (_FontImpl::GetInstance(*__pFont))->SetStyle(FONT_STYLE_BOLD);
                GET_COLOR_CONFIG(EDITDATE::TEXT_PRESSED, textColor);
@@ -704,7 +704,7 @@ _EditDatePresenter::DrawContentBitmap(Canvas& canvas, const FloatRectangle& boun
                pReplacementBitmap = __pContentBgDisabledColorReplacementBitmap;
                pEffectBitmap = __pContentBgEffectDisabledBitmap;
        }
-       else if (__selectedId != boxId)
+       else if (GetLastSelectedId() != boxId)
        {
                isCustomBitmap = IS_CUSTOM_BITMAP(EDITTIME::CONTENT_BG_NORMAL);
                pReplacementBitmap = __pContentBgNormalColorReplacementBitmap;

diff --git a/src/ui/controls/FUiCtrl_EditTime.cpp b/src/ui/controls/FUiCtrl_EditTime.cpp
index f6463a0..567bce0 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditTime.cpp
+++ b/src/ui/controls/FUiCtrl_EditTime.cpp
@@ -477,9 +477,14 @@ _EditTime::CalculateDateTimeBarPosition(void)
 void
 _EditTime::OnDraw(void)
 {
-       if (GetDateTimeBar() != null && GetDateTimeBar()->IsActivated())
+       if (GetDateTimeBar() != null)
        {
-               CalculateDateTimeBarPosition();
+               FloatRectangle absoluteBounds = GetAbsoluteBoundsF();
+
+               if (absoluteBounds.y != __absoluteBounds.y || absoluteBounds.height != __absoluteBounds.height)
+               {
+                       CalculateDateTimeBarPosition();
+               }
        }
 
        __pEditTimePresenter->Draw();