[Winset-GUI-v5.0] Apply Token BG Color in EEA

Change-Id: Ie2cb3badec19ab9312e7d9a4ccd7f9fd9c604f80
Signed-off-by: Sudha <sudha.reddy@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_TokenEdit.cpp b/src/ui/controls/FUiCtrl_TokenEdit.cpp
index b907202..f1dc95b 100644 (file)
--- a/src/ui/controls/FUiCtrl_TokenEdit.cpp
+++ b/src/ui/controls/FUiCtrl_TokenEdit.cpp
@@ -47,7 +47,6 @@ _TokenEdit::_TokenEdit(void)
        GET_COLOR_CONFIG(TOKENEDIT::BG_SELECTED, __tokenColor[TOKEN_EDIT_STATUS_SELECTED]);
        GET_COLOR_CONFIG(TOKENEDIT::BG_HIGHLIGHTED, __tokenColor[TOKEN_EDIT_STATUS_HIGHLIGHTED]);
        GET_COLOR_CONFIG(TOKENEDIT::BG_DISABLED, __tokenColor[TOKEN_EDIT_STATUS_DISABLED]);
-       __tokenColor[TOKEN_EDIT_STATUS_DISABLED].SetAlpha(TOKEN_EDIT_BG_DISABLED_OPACITY); //apply dimming
        GET_COLOR_CONFIG(TOKENEDIT::TEXT_NORMAL, __tokenTextColor[EXPANDABLE_EDIT_AREA_TOKEN_STATUS_NORMAL]);
        GET_COLOR_CONFIG(TOKENEDIT::TEXT_SELECTED, __tokenTextColor[EXPANDABLE_EDIT_AREA_TOKEN_STATUS_SELECTED]);
 

diff --git a/src/ui/inc/FUiCtrl_TokenEdit.h b/src/ui/inc/FUiCtrl_TokenEdit.h
index d594f3c..0978dce 100644 (file)
--- a/src/ui/inc/FUiCtrl_TokenEdit.h
+++ b/src/ui/inc/FUiCtrl_TokenEdit.h
@@ -170,8 +170,6 @@ private:
 
        Tizen::Ui::_AccessibilityElement* __pTitleTextAccessibilityElement;
        Tizen::Ui::_AccessibilityElement* __pCursorAccessibilityElement;
-
-       static const int TOKEN_EDIT_BG_DISABLED_OPACITY = 0x99; //opacity is 60% of BG_DISABLED
 };  // _TokenEdit
 
 }}} // Tizen::Ui::Controls

diff --git a/src/ui/resource/FUi_ResourceTokenEditConfig.cpp b/src/ui/resource/FUi_ResourceTokenEditConfig.cpp
index 8234086..a9dba2d 100644 (file)
--- a/src/ui/resource/FUi_ResourceTokenEditConfig.cpp
+++ b/src/ui/resource/FUi_ResourceTokenEditConfig.cpp
@@ -25,13 +25,13 @@
 START_UI_CONFIG(TOKENEDIT);
 {
        ADD_COLOR_CONFIG(BG_NORMAL, $W0711);
-       ADD_COLOR_CONFIG(BG_SELECTED, $W0713);
+       ADD_COLOR_CONFIG(BG_SELECTED, $W0711P);
        ADD_COLOR_CONFIG(TEXT_NORMAL, $F011L9);
        ADD_COLOR_CONFIG(TEXT_SELECTED, $F011L9);
        ADD_COLOR_CONFIG(TEXT_HIGHLIGHTED, $F011L9);
        ADD_COLOR_CONFIG(TEXT_DISABLED, $F011L9);
        ADD_COLOR_CONFIG(BG_HIGHLIGHTED, $W0715);
-       ADD_COLOR_CONFIG(BG_DISABLED, $W0711);
+       ADD_COLOR_CONFIG(BG_DISABLED, $W0711D);
        ADD_COLOR_CONFIG(TITLE_TEXT_NORMAL, $F011L11);
        ADD_COLOR_CONFIG(TITLE_TEXT_PRESSED, $F011L11);
        ADD_COLOR_CONFIG(TITLE_TEXT_HIGHLIGHTED, $F011L11);