issue fixed in EditTime to retain the pressed state

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

diff --git a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
index 26b4994..3170d7f 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
@@ -917,9 +917,19 @@ _EditTimePresenter::DrawContentBitmap(Canvas& canvas, const FloatRectangle& boun
        }
        else if (__selectedId != boxId)
        {
-               isCustomBitmap = IS_CUSTOM_BITMAP(EDITTIME::CONTENT_BG_NORMAL);
-               pReplacementBitmap = __pContentBgNormalColorReplacementBitmap;
-               pEffectBitmap = __pContentBgEffectNormalBitmap;
+               if (__pEditTime->GetDateTimeBar() != null && __pEditTime->GetDateTimeBar()->IsActivated() &&
+                               (GetLastSelectedId() == boxId))
+               {
+                       isCustomBitmap = IS_CUSTOM_BITMAP(EDITTIME::CONTENT_BG_PRESSED);
+                       pReplacementBitmap = __pContentBgPressedColorReplacementBitmap;
+                       pEffectBitmap = __pContentBgEffectPressedBitmap;
+               }
+               else
+               {
+                       isCustomBitmap = IS_CUSTOM_BITMAP(EDITTIME::CONTENT_BG_NORMAL);
+                       pReplacementBitmap = __pContentBgNormalColorReplacementBitmap;
+                       pEffectBitmap = __pContentBgEffectNormalBitmap;
+               }
        }
        else
        {
@@ -946,6 +956,7 @@ _EditTimePresenter::DrawText(Canvas& canvas, const FloatRectangle& bounds, const
        result r = E_SUCCESS;
 
        Color textColor;
+       (_FontImpl::GetInstance(*__pFont))->SetStyle(FONT_STYLE_PLAIN);
 
        if (!__pEditTime->IsEnabled())
        {
@@ -966,6 +977,7 @@ _EditTimePresenter::DrawText(Canvas& canvas, const FloatRectangle& bounds, const
                                (GetLastSelectedId() == boxId))
                {
                        GET_COLOR_CONFIG(EDITTIME::TEXT_PRESSED, textColor);
+                       (_FontImpl::GetInstance(*__pFont))->SetStyle(FONT_STYLE_BOLD);
                }
 
                if (boxId == DATETIME_ID_AMPM)
@@ -982,6 +994,7 @@ _EditTimePresenter::DrawText(Canvas& canvas, const FloatRectangle& bounds, const
                        else
                        {
                                GET_COLOR_CONFIG(EDITTIME::TEXT_PRESSED, textColor);
+                               (_FontImpl::GetInstance(*__pFont))->SetStyle(FONT_STYLE_BOLD);
                        }
                }
        }
@@ -1001,15 +1014,8 @@ _EditTimePresenter::DrawText(Canvas& canvas, const FloatRectangle& bounds, const
        __textObject.RemoveAll();
 
        (_FontImpl::GetInstance(*__pFont))->SetSize(__timeFontSize);
-       (_FontImpl::GetInstance(*__pFont))->SetStyle(FONT_STYLE_PLAIN);
-
        __textObject.AppendElement(*pSimpleText);
 
-       if (boxId == __selectedId && boxId != DATETIME_ID_AMPM)
-       {
-               (_FontImpl::GetInstance(*__pFont))->SetStyle(FONT_STYLE_BOLD);
-       }
-
        if (boxId == DATETIME_ID_AMPM)
        {
                (_FontImpl::GetInstance(*__pFont))->SetSize(textSize);