Apply BG_DISABLED in TokenEdit

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

diff --git a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
index b0d5310..9faeedc 100644 (file)
--- a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
@@ -24,7 +24,6 @@
 #include <FGrp_FontImpl.h>
 #include "FUiAnim_VisualElement.h"
 #include "FUi_UiTouchEvent.h"
-#include "FUiCtrl_TokenEdit.h"
 #include "FUiCtrl_TokenEditPresenter.h"
 #include "FUiCtrl_Scroll.h"
 #include "FUi_Math.h"
@@ -599,7 +598,7 @@ _TokenEditPresenter::DrawText(void)
                        pTokenCanvas->SetBackgroundColor(Color(0));
                        pTokenCanvas->Clear();
 
-                       Color selectedTokenColor = GetTokenEditColor(EXPANDABLE_EDIT_AREA_TOKEN_STATUS_SELECTED);
+                       Color selectedTokenColor = GetTokenEditColor(TOKEN_EDIT_STATUS_SELECTED);
                        Bitmap* pReplacementColorBackgroundBitmap = null;
                        if (__pTokenBgBitmap)
                        {
@@ -778,6 +777,7 @@ _TokenEditPresenter::DrawToken(int count)
 
        Color normalTokenColor;
        Color selectedTokenColor;
+       Color disabledTokenColor;
 
        for (int i = drawStartIndex; i < tokenCount; i++)
        {
@@ -790,8 +790,9 @@ _TokenEditPresenter::DrawToken(int count)
                        break;
                }
 
-               normalTokenColor = GetTokenEditColor(EXPANDABLE_EDIT_AREA_TOKEN_STATUS_NORMAL);
-               selectedTokenColor = GetTokenEditColor(EXPANDABLE_EDIT_AREA_TOKEN_STATUS_SELECTED);
+               normalTokenColor = GetTokenEditColor(TOKEN_EDIT_STATUS_NORMAL);
+               selectedTokenColor = GetTokenEditColor(TOKEN_EDIT_STATUS_SELECTED);
+               disabledTokenColor = GetTokenEditColor(TOKEN_EDIT_STATUS_DISABLED);
 
                _VisualElement* pTokenElement = pToken->GetVisualElement();
                if (pTokenElement == null)
@@ -848,9 +849,15 @@ _TokenEditPresenter::DrawToken(int count)
                }
                else
                {
+                       Color tokenBgColor = normalTokenColor;
+                       if (GetCurrentStatus() == EDIT_STATUS_DISABLED)
+                       {
+                               tokenBgColor = disabledTokenColor;
+                       }
+
                        if (__pTokenBgBitmap)
                        {
-                               pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pTokenBgBitmap, Color::GetColor(COLOR_ID_MAGENTA), normalTokenColor);
+                               pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pTokenBgBitmap, Color::GetColor(COLOR_ID_MAGENTA), tokenBgColor);
 
                                if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pReplacementColorBackgroundBitmap))
                                {
@@ -863,7 +870,7 @@ _TokenEditPresenter::DrawToken(int count)
                        }
                        else
                        {
-                               pTokenCanvas->FillRectangle(normalTokenColor, tokenRect);
+                               pTokenCanvas->FillRectangle(tokenBgColor, tokenRect);
                        }
 
 
@@ -927,11 +934,11 @@ _TokenEditPresenter::DrawToken(int count)
 
                        if (isSelected)
                        {
-                               textColor = GetTokenEditTextColor(EXPANDABLE_EDIT_AREA_TOKEN_STATUS_SELECTED);
+                               textColor = GetTokenEditTextColor(TOKEN_EDIT_STATUS_SELECTED);
                        }
                        else
                        {
-                               textColor = GetTokenEditTextColor(EXPANDABLE_EDIT_AREA_TOKEN_STATUS_NORMAL);
+                               textColor = GetTokenEditTextColor(TOKEN_EDIT_STATUS_NORMAL);
                        }
 
                        pToken->pTextObject->SetForegroundColor(textColor, 0, pToken->pTextObject->GetTextLength());
@@ -950,32 +957,21 @@ _TokenEditPresenter::DrawToken(int count)
 }
 
 Color
-_TokenEditPresenter::GetTokenEditColor(const ExpandableEditAreaTokenStatus status) const
+_TokenEditPresenter::GetTokenEditColor(const TokenEditStatus status) const
 {
        SysTryReturn(NID_UI_CTRL, __pTokenEdit != null, Color(0, 0, 0, 0), E_INVALID_STATE, "[E_INVALID_STATE] _TokenEdit is in an invalid state.");
 
-       Color color;
-
-       if (status == EXPANDABLE_EDIT_AREA_TOKEN_STATUS_NORMAL)
-       {
-               color = __pTokenEdit->GetTokenColor(EXPANDABLE_EDIT_AREA_TOKEN_STATUS_NORMAL);
-       }
-       else
-       {
-               color = __pTokenEdit->GetTokenColor(EXPANDABLE_EDIT_AREA_TOKEN_STATUS_SELECTED);
-       }
-
-       return color;
+       return __pTokenEdit->GetTokenColor(status);
 }
 
 Color
-_TokenEditPresenter::GetTokenEditTextColor(const ExpandableEditAreaTokenStatus status) const
+_TokenEditPresenter::GetTokenEditTextColor(const TokenEditStatus status) const
 {
        SysTryReturn(NID_UI_CTRL, __pTokenEdit != null, Color(0, 0, 0, 0), E_INVALID_STATE, "[E_INVALID_STATE] _TokenEdit is in an invalid state.");
 
        Color color;
 
-       if (status == EXPANDABLE_EDIT_AREA_TOKEN_STATUS_NORMAL)
+       if (status == TOKEN_EDIT_STATUS_NORMAL)
        {
                color = __pTokenEdit->GetTokenTextColor();
        }