fixed bug (about FocusRing)

Change-Id: I61553a9b870f19888d39c0dae423c2edd0cb52fa

diff --git a/src/ui/controls/FUiCtrl_Edit.cpp b/src/ui/controls/FUiCtrl_Edit.cpp
index 3795d65..f5a8abd 100755 (executable)
--- a/src/ui/controls/FUiCtrl_Edit.cpp
+++ b/src/ui/controls/FUiCtrl_Edit.cpp
@@ -3380,15 +3380,12 @@ _Edit::OnSettingChanged(String& key)
 void
 _Edit::OnDrawFocus(void)
 {
-       if (_pEditPresenter->GetSearchBarFlag())
-       {
-               SetSearchFieldFocus(true);
-               Invalidate();
-       }
-       else
-       {
-               _Control::OnDrawFocus();
-       }
+       Canvas* pCanvas = GetCanvasN();
+       SysTryReturnVoidResult(NID_UI_CTRL, pCanvas, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Unable to create instance.");
+
+       _pEditPresenter->DrawFocusRing(*pCanvas);
+
+       delete pCanvas;
 
        return;
 }

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index 5e19fe7..46c6700 100755 (executable)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -1604,34 +1604,6 @@ _EditPresenter::DrawChangeableBackground(Canvas& canvas, bool focused, int bitma
                }
        }
 
-       if (GetSearchBarFlag() && IsCurrentFocused() && __pEdit->IsSearchFieldFocused())
-       {
-               Bitmap* pFocusBitmap = null;
-               Bitmap* pReplacementColorFocusBitmap = null;
-
-               Color focusColor;
-               GET_COLOR_CONFIG(SEARCHBAR::EDIT_BG_FOCUS, focusColor);
-
-               pFocusBitmap = __pEdit->GetDefaultFocusBitmap();
-
-               pReplacementColorFocusBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pFocusBitmap, Color::GetColor(COLOR_ID_MAGENTA), focusColor);
-
-               if (pReplacementColorFocusBitmap)
-               {
-                       if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pReplacementColorFocusBitmap))
-                       {
-                               canvas.DrawNinePatchedBitmap(editRect, *pReplacementColorFocusBitmap);
-                       }
-                       else
-                       {
-                               canvas.DrawBitmap(editRect, *pReplacementColorFocusBitmap);
-                       }
-               }
-
-               delete pReplacementColorFocusBitmap;
-               pReplacementColorFocusBitmap = null;
-       }
-
        if (borderRoundEnable)
        {
                if (pEditBgBitmap)
@@ -11464,9 +11436,9 @@ _EditPresenter::IsClearIconPressed(void) const
 }
 
 result
-_EditPresenter::DrawFocusRing(Tizen::Graphics::Canvas& canvas) const
+_EditPresenter::DrawFocusRing(Tizen::Graphics::Canvas& canvas)
 {
-       if (IsViewModeEnabled() || !__pEdit->IsEnabled())
+       if (__pEditModel->IsViewModeEnabled() || !__pEdit->IsEnabled())
        {
                return E_SUCCESS;
        }
@@ -11478,7 +11450,7 @@ _EditPresenter::DrawFocusRing(Tizen::Graphics::Canvas& canvas) const
        if (IsCurrentFocused() && color.GetAlpha())
        {
                Color focusColor;
-               GET_COLOR_CONFIG(EDIT::CURSOR_NORMAL, focusColor);
+               GET_COLOR_CONFIG(FOCUSUI::CONTENT_BG_HIGHLIGHTED, focusColor);
                focusColor.SetAlpha(color.GetAlpha());
 
                r = GET_BITMAP_CONFIG_N(EDIT::BG_RING_FOCUSED, BITMAP_PIXEL_FORMAT_ARGB8888, pFocusRing);

diff --git a/src/ui/inc/FUiCtrl_EditPresenter.h b/src/ui/inc/FUiCtrl_EditPresenter.h
index 3451755..f87b931 100755 (executable)
--- a/src/ui/inc/FUiCtrl_EditPresenter.h
+++ b/src/ui/inc/FUiCtrl_EditPresenter.h
@@ -339,7 +339,7 @@ public:
        result SetPasswordVisible(bool visible);
        bool IsPasswordVisible(void) const;
        bool IsClearIconPressed(void) const;
-       result DrawFocusRing(Tizen::Graphics::Canvas& canvas) const;
+       result DrawFocusRing(Tizen::Graphics::Canvas& canvas);
 
 protected:
        void StopTitleSlidingTimer(void);