Fix for JIRA N_SE-53794 in EditTime

[platform/framework/native/uifw.git] / src / ui / controls / FUiCtrl_EditTimePresenter.cpp

diff --git a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
index 6c6c550..98e7b4a 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
@@ -434,6 +434,9 @@ _EditTimePresenter::GetTextWidth(_DateTimeId boxId) const
 
        (_FontImpl::GetInstance(*__pFont))->SetSize(__timeFontSize);
 
+       pSimpleText->SetTextShadowEnabled(true);
+       pSimpleText->SetTextShadowOffset(FloatPoint(0.0f, -1.0f));
+
        dateObject.AppendElement(*pSimpleText);
        dateObject.SetFont(__pFont, 0, dateObject.GetTextLength());
        dim = dateObject.GetTextExtentF(0, dateObject.GetTextLength());
@@ -473,7 +476,7 @@ _EditTimePresenter::LoadResource(void)
        Color contentHighlightedColor;
        Color colonTextColor;
        Color colonTextDisabledColor;
-       Bitmap* pTempBitmap = null;
+
 
        GET_COLOR_CONFIG(EDITTIME::BUTTON_BG_NORMAL, buttonNormalBgColor);
        GET_COLOR_CONFIG(EDITTIME::BUTTON_BG_PRESSED, buttonPressedColor);
@@ -490,21 +493,12 @@ _EditTimePresenter::LoadResource(void)
 
        GET_SHAPE_CONFIG(EDITTIME::AMPM_FONT_SIZE, __pEditTime->GetOrientation(), __amPmTextSize);
 
-       r = GET_BITMAP_CONFIG_N(EDITTIME::COLON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
+       r = GET_REPLACED_BITMAP_CONFIG_N(EDITTIME::COLON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, colonTextColor, __pColonColorReplacementBitmap);
        SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "[%s] Propagating.", GetErrorMessage(r));
 
-       __pColonColorReplacementBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                                                                             colonTextColor);
-       SysTryCatch(NID_UI_CTRL, (__pColonColorReplacementBitmap != null), r = GetLastResult(), GetLastResult(),
-                       "[%s] Propagating.", GetErrorMessage(GetLastResult()));
-
-       __pColonDisabledColorReplacementBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                       colonTextDisabledColor);
-       SysTryCatch(NID_UI_CTRL, (__pColonDisabledColorReplacementBitmap != null), r = GetLastResult(), GetLastResult(),
-                       "[%s] Propagating.", GetErrorMessage(GetLastResult()));
+       r = GET_REPLACED_BITMAP_CONFIG_N(EDITTIME::COLON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, colonTextDisabledColor, __pColonDisabledColorReplacementBitmap);
+       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
-       delete pTempBitmap;
-       pTempBitmap = null;
 
        r = GET_REPLACED_BITMAP_CONFIG_N(EDITTIME::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, buttonNormalBgColor, __pAmPmBgNormalColorReplacementBitmap);
        SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -551,6 +545,13 @@ _EditTimePresenter::LoadResource(void)
        return r;
 
 CATCH:
+
+       delete __pColonColorReplacementBitmap;
+       __pColonColorReplacementBitmap = null;
+
+       delete __pColonDisabledColorReplacementBitmap;
+       __pColonDisabledColorReplacementBitmap = null;
+
        delete __pAmPmBgNormalColorReplacementBitmap;
        __pAmPmBgNormalColorReplacementBitmap = null;
 
@@ -603,7 +604,7 @@ CATCH:
 }
 
 result
-_EditTimePresenter::DrawResourceBitmap(Canvas& canvas, const FloatRectangle& bounds, Bitmap* pBitmap)
+_EditTimePresenter::DrawResourceBitmap(Canvas& canvas, const FloatRectangle& bounds, Bitmap* pBitmap, bool isCustomBitmap)
 {
        result r = E_SUCCESS;
 
@@ -619,7 +620,23 @@ _EditTimePresenter::DrawResourceBitmap(Canvas& canvas, const FloatRectangle& bou
        }
        else
        {
-               r = canvas.DrawBitmap(bounds, *pBitmap);
+               if (isCustomBitmap)
+               {
+                       Canvas *pContentCanvas = __pEditTime->GetCanvasN(bounds);
+                       SysTryReturnResult(NID_UI_CTRL, (pContentCanvas != null), GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
+
+                       FloatPoint position;
+
+                       position.x = (bounds.width - pBitmap->GetWidthF()) / 2;
+                       position.y = (bounds.height - pBitmap->GetHeightF()) / 2;
+                       r = pContentCanvas->DrawBitmap(position, *pBitmap);
+                       delete pContentCanvas;
+               }
+               else
+               {
+                       r = canvas.DrawBitmap(FloatPoint(bounds.x, bounds.y), *pBitmap);
+               }
+
                SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r));
        }
 
@@ -702,6 +719,9 @@ _EditTimePresenter::InitializeTextObject(void)
        SysTryReturn(NID_UI_CTRL, (pSimpleText != null), E_OUT_OF_MEMORY, E_OUT_OF_MEMORY,
                        "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
+       pSimpleText->SetTextShadowEnabled(true);
+       pSimpleText->SetTextShadowOffset(FloatPoint(0.0f, -1.0f));
+
        __textObject.AppendElement(*pSimpleText);
 
        __textObject.SetFont(__pFont, 0, __textObject.GetTextLength());
@@ -804,7 +824,7 @@ _EditTimePresenter::Draw(void)
 
        if (!__24hours)
        {
-               r = DrawResourceBitmap(*pCanvas, ampmBounds, pReplacementBitmap);
+               r = DrawResourceBitmap(*pCanvas, ampmBounds, pReplacementBitmap, isCustomBitmap);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
                if (!isCustomBitmap)
@@ -827,8 +847,9 @@ _EditTimePresenter::DrawFocus(void)
 {
        FloatRectangle bounds(0.0f, 0.0f, 0.0f, 0.0f);
 
+       Canvas* pContentCanvas = null;
        Canvas* pCanvas = __pEditTime->GetCanvasN();
-       SysTryReturnResult(NID_UI_CTRL, (pCanvas != null), E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Unable to create canvas.");
+       SysTryReturnResult(NID_UI_CTRL, (pCanvas != null), GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
        if (__focusId == DATETIME_ID_HOUR)
        {
@@ -851,8 +872,15 @@ _EditTimePresenter::DrawFocus(void)
        }
        else
        {
-               r = pCanvas->DrawBitmap(bounds, *__pContentBgHighlightedColorReplacementBitmap);
+               pContentCanvas = __pEditTime->GetCanvasN(bounds);
+               SysTryCatch(NID_UI_CTRL, (pContentCanvas != null), , GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
+
+               bounds.x = (bounds.width - __pContentBgHighlightedColorReplacementBitmap->GetWidthF()) / 2;
+               bounds.y = (bounds.height - __pContentBgHighlightedColorReplacementBitmap->GetHeightF()) / 2;
+
+               r = pContentCanvas->DrawBitmap(FloatPoint(bounds.x, bounds.y), *__pContentBgHighlightedColorReplacementBitmap);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
+               delete pContentCanvas;
        }
 
        delete pCanvas;
@@ -860,6 +888,7 @@ _EditTimePresenter::DrawFocus(void)
 
 CATCH:
        delete pCanvas;
+       delete pContentCanvas;
        return r;
 }
 
@@ -914,21 +943,11 @@ _EditTimePresenter::DrawContentBitmap(Canvas& canvas, const FloatRectangle& boun
                pReplacementBitmap = __pContentBgDisabledColorReplacementBitmap;
                pEffectBitmap = __pContentBgEffectDisabledBitmap;
        }
-       else if (__selectedId != boxId)
+       else if (GetLastSelectedId() != boxId)
        {
-               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;
-               }
+               isCustomBitmap = IS_CUSTOM_BITMAP(EDITTIME::CONTENT_BG_NORMAL);
+               pReplacementBitmap = __pContentBgNormalColorReplacementBitmap;
+               pEffectBitmap = __pContentBgEffectNormalBitmap;
        }
        else
        {
@@ -937,7 +956,7 @@ _EditTimePresenter::DrawContentBitmap(Canvas& canvas, const FloatRectangle& boun
                pEffectBitmap = __pContentBgEffectPressedBitmap;
        }
 
-       r = DrawResourceBitmap(canvas, bounds, pReplacementBitmap);
+       r = DrawResourceBitmap(canvas, bounds, pReplacementBitmap, isCustomBitmap);
        SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        if (!isCustomBitmap)
@@ -972,30 +991,23 @@ _EditTimePresenter::DrawText(Canvas& canvas, const FloatRectangle& bounds, const
        {
                GET_COLOR_CONFIG(EDITTIME::TEXT_NORMAL, textColor);
 
-               if (__pEditTime->GetDateTimeBar() != null && __pEditTime->GetDateTimeBar()->IsActivated() &&
-                               (GetLastSelectedId() == boxId))
-               {
-                       GET_COLOR_CONFIG(EDITTIME::TEXT_PRESSED, textColor);
-                       (_FontImpl::GetInstance(*__pFont))->SetStyle(FONT_STYLE_BOLD);
-               }
-
                if (boxId == DATETIME_ID_AMPM)
                {
-                       GET_COLOR_CONFIG(EDITTIME::BUTTON_TEXT_NORMAL, textColor);
-               }
-
-               if (boxId > -1 && boxId == __selectedId)
-               {
-                       if (boxId == DATETIME_ID_AMPM)
+                       if (boxId == __selectedId)
                        {
                                GET_COLOR_CONFIG(EDITTIME::BUTTON_TEXT_PRESSED, textColor);
                        }
                        else
                        {
-                               GET_COLOR_CONFIG(EDITTIME::TEXT_PRESSED, textColor);
-                               (_FontImpl::GetInstance(*__pFont))->SetStyle(FONT_STYLE_BOLD);
+                               GET_COLOR_CONFIG(EDITTIME::BUTTON_TEXT_NORMAL, textColor);
                        }
                }
+
+               else if (boxId > -1 && boxId == GetLastSelectedId())
+               {
+                       GET_COLOR_CONFIG(EDITTIME::TEXT_PRESSED, textColor);
+                       (_FontImpl::GetInstance(*__pFont))->SetStyle(FONT_STYLE_BOLD);
+               }
        }
 
        if (boxId != DATETIME_ID_AMPM)
@@ -1013,6 +1025,10 @@ _EditTimePresenter::DrawText(Canvas& canvas, const FloatRectangle& bounds, const
        __textObject.RemoveAll();
 
        (_FontImpl::GetInstance(*__pFont))->SetSize(__timeFontSize);
+
+       pSimpleText->SetTextShadowEnabled(true);
+       pSimpleText->SetTextShadowOffset(FloatPoint(0.0f, -1.0f));
+
        __textObject.AppendElement(*pSimpleText);
 
        if (boxId == DATETIME_ID_AMPM)
@@ -1099,7 +1115,11 @@ _EditTimePresenter::SetFocusedElement()
        if (__isEnterKeyPressed)
        {
                __isEnterKeyPressed = false;
-               __isFocused = true;
+
+               if (__pEditTime->IsFocusModeStateEnabled())
+               {
+                       __isFocused = true;
+               }
        }
        if (__focusId == DATETIME_ID_NONE || __focusId == DATETIME_ID_AMPM)
        {
@@ -1122,6 +1142,7 @@ _EditTimePresenter::OnFocusLost(const _Control &source)
        if (!__isEnterKeyPressed || __focusId == DATETIME_ID_AMPM)
        {
                __focusId = DATETIME_ID_NONE;
+               __selectedId = DATETIME_ID_NONE;
        }
        __isFocused = false;
        __pEditTime->Invalidate();
@@ -1133,6 +1154,8 @@ _EditTimePresenter::OnFocusModeStateChanged(void)
 {
        __isFocused = false;
        __focusId = DATETIME_ID_NONE;
+       __isEnterKeyPressed = false;
+       __selectedId = DATETIME_ID_NONE;
        __pEditTime->Invalidate();
        return;
 }
@@ -1188,6 +1211,19 @@ _EditTimePresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo
                        __pEditTime->Invalidate();
                        break;
                }
+               case _KEY_ENTER:
+               {
+                       if (__focusId == DATETIME_ID_AMPM)
+                       {
+                               __selectedId = DATETIME_ID_AMPM;
+                               __pEditTime->Invalidate();
+                       }
+                       else
+                       {
+                               return false;
+                       }
+                       break;
+               }
 
                default:
                {
@@ -1198,17 +1234,16 @@ _EditTimePresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo
 }
 
 bool
-_EditTimePresenter::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
+_EditTimePresenter::OnKeyReleased(const _Control& source, const _KeyCode& keyCode)
 {
        if (!__isFocused)
        {
                return false;
        }
-       _KeyCode keyCode = keyInfo.GetKeyCode();
 
        if (__isAnimating)
        {
-               VisualElement *pEditTimeElement = __pEditTime->GetVisualElement();
+               VisualElement* pEditTimeElement = __pEditTime->GetVisualElement();
                result r = GetLastResult();
                SysTryReturn(NID_UI_CTRL, (pEditTimeElement != null), false, r, "[%s] Propagating.", GetErrorMessage(r));
                pEditTimeElement->RemoveAllAnimations();
@@ -1284,6 +1319,7 @@ _EditTimePresenter::OnKeyReleased(const _Control& source, const _KeyInfo& keyInf
                                SetAmEnabled(!GetAmEnabled());
                                __pEditTime->FireTimeChangeEvent(TIME_INTERNAL_CHANGE_SAVED);
                                boxId = DATETIME_ID_AMPM;
+                               __selectedId = DATETIME_ID_NONE;
 
                                __pEditTime->Invalidate();
                        }
@@ -1733,8 +1769,8 @@ _EditTimePresenter::Animate(void)
        VisualElement* pEditTimeElement = null;
        VisualElementPropertyAnimation* pNewBoundsAnimation = null;
        VisualElementPropertyAnimation* pOldBoundsAnimation = null;
-       Canvas *pCanvas = null;
-       Canvas *pContentCanvas = null;
+       Canvas* pCanvas = null;
+       Canvas* pContentCanvas = null;
        Color contentBgColor;
        Color textNormalColor;
        Color textPressedColor;
@@ -1825,8 +1861,8 @@ _EditTimePresenter::Animate(void)
        pCanvas->Clear();
        rect.x = 0.0f;
        rect.y = 0.0f;
-       r = DrawResourceBitmap(*pCanvas, rect, __pContentBgPressedColorReplacementBitmap);
        isCustomBitmap = IS_CUSTOM_BITMAP(EDITTIME::CONTENT_BG_PRESSED);
+       r = DrawResourceBitmap(*pCanvas, rect, __pContentBgPressedColorReplacementBitmap, isCustomBitmap);
 
        if (!isCustomBitmap)
        {
@@ -1874,6 +1910,9 @@ _EditTimePresenter::Animate(void)
        pOldSimpleText = new (std::nothrow)TextSimple((const_cast <wchar_t*>(__lastSelectedValue.GetPointer())), __lastSelectedValue.GetLength(), TEXT_ELEMENT_SOURCE_TYPE_EXTERNAL);
        SysTryCatch(NID_UI_CTRL, (pOldSimpleText != null), , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
+       pOldSimpleText->SetTextShadowEnabled(true);
+       pOldSimpleText->SetTextShadowOffset(FloatPoint(0.0f, -1.0f));
+
        pCanvas = pOldVisualElement->GetCanvasN();
        r = GetLastResult();
        SysTryCatch(NID_UI_CTRL, (pCanvas != null), , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -1898,6 +1937,9 @@ _EditTimePresenter::Animate(void)
        pNewSimpleText = new (std::nothrow)TextSimple((const_cast <wchar_t*>(newValue.GetPointer())), newValue.GetLength(), TEXT_ELEMENT_SOURCE_TYPE_EXTERNAL);
        SysTryCatch(NID_UI_CTRL, (pNewSimpleText != null), , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
+       pNewSimpleText->SetTextShadowEnabled(true);
+       pNewSimpleText->SetTextShadowOffset(FloatPoint(0.0f, -1.0f));
+
        pCanvas = pNewVisualElement->GetCanvasN();
        r = GetLastResult();
        SysTryCatch(NID_UI_CTRL, (pCanvas != null), , r, "[%s] Propagating.", GetErrorMessage(r));