Apply BG_DISABLED in TokenEdit

Change-Id: Idd6c64823984960e0bd575b1ccffa20665470acf
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 3872763..39c6efe 100644 (file)
--- a/src/ui/controls/FUiCtrl_TokenEdit.cpp
+++ b/src/ui/controls/FUiCtrl_TokenEdit.cpp
@@ -43,8 +43,10 @@ _TokenEdit::_TokenEdit(void)
        , __pTitleTextAccessibilityElement(null)
        , __pCursorAccessibilityElement(null)
 {
-       GET_COLOR_CONFIG(TOKENEDIT::BG_NORMAL, __tokenColor[EXPANDABLE_EDIT_AREA_TOKEN_STATUS_NORMAL]);
-       GET_COLOR_CONFIG(TOKENEDIT::BG_SELECTED, __tokenColor[EXPANDABLE_EDIT_AREA_TOKEN_STATUS_SELECTED]);
+       GET_COLOR_CONFIG(TOKENEDIT::BG_NORMAL, __tokenColor[TOKEN_EDIT_STATUS_NORMAL]);
+       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]);
 
        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]);
@@ -208,20 +210,28 @@ _TokenEdit::SetTokenEditModeEnabled(bool enable)
 }
 
 Color
-_TokenEdit::GetTokenColor(ExpandableEditAreaTokenStatus status) const
+_TokenEdit::GetTokenColor(TokenEditStatus status) const
 {
        Variant var;
 
        switch (status)
        {
-       case EXPANDABLE_EDIT_AREA_TOKEN_STATUS_NORMAL:
+       case TOKEN_EDIT_STATUS_NORMAL:
                var = GetProperty("normalTokenColor");
                break;
 
-       case EXPANDABLE_EDIT_AREA_TOKEN_STATUS_SELECTED:
+       case TOKEN_EDIT_STATUS_SELECTED:
                var = GetProperty("selectedTokenColor");
                break;
 
+       case TOKEN_EDIT_STATUS_HIGHLIGHTED:
+               var = GetProperty("highlightedTokenColor");
+               break;
+
+       case TOKEN_EDIT_STATUS_DISABLED:
+               var = GetProperty("disabledTokenColor");
+               break;
+
        default:
                break;
        }
@@ -238,21 +248,28 @@ _TokenEdit::GetTokenTextColor(void) const
 }
 
 result
-_TokenEdit::SetTokenColor(ExpandableEditAreaTokenStatus status, const Color& color)
+_TokenEdit::SetTokenColor(TokenEditStatus status, const Color& color)
 {
        result r = E_SUCCESS;
        Variant var(color);
 
        switch (status)
        {
-       case EXPANDABLE_EDIT_AREA_TOKEN_STATUS_NORMAL:
+       case TOKEN_EDIT_STATUS_NORMAL:
                r = SetProperty("normalTokenColor", var);
                break;
 
-       case EXPANDABLE_EDIT_AREA_TOKEN_STATUS_SELECTED:
+       case TOKEN_EDIT_STATUS_SELECTED:
                r = SetProperty("selectedTokenColor", var);
                break;
 
+       case TOKEN_EDIT_STATUS_HIGHLIGHTED:
+               r = SetProperty("highlightedTokenColor", var);
+               break;
+
+       case TOKEN_EDIT_STATUS_DISABLED:
+               r = SetProperty("disabledTokenColor", var);
+               break;
        default:
                break;
        }
@@ -388,7 +405,7 @@ _TokenEdit::SetPropertyNormalTokenColor(const Variant& color)
 {
        ClearLastResult();
 
-       __tokenColor[EXPANDABLE_EDIT_AREA_TOKEN_STATUS_NORMAL] = color.ToColor();
+       __tokenColor[TOKEN_EDIT_STATUS_NORMAL] = color.ToColor();
 
        return E_SUCCESS;
 }
@@ -398,7 +415,7 @@ _TokenEdit::GetPropertyNormalTokenColor(void) const
 {
        ClearLastResult();
 
-       return Variant(__tokenColor[EXPANDABLE_EDIT_AREA_TOKEN_STATUS_NORMAL]);
+       return Variant(__tokenColor[TOKEN_EDIT_STATUS_NORMAL]);
 }
 
 result
@@ -406,7 +423,7 @@ _TokenEdit::SetPropertySelectedTokenColor(const Variant& color)
 {
        ClearLastResult();
 
-       __tokenColor[EXPANDABLE_EDIT_AREA_TOKEN_STATUS_SELECTED] = color.ToColor();
+       __tokenColor[TOKEN_EDIT_STATUS_SELECTED] = color.ToColor();
 
        return E_SUCCESS;
 }
@@ -416,7 +433,43 @@ _TokenEdit::GetPropertySelectedTokenColor(void) const
 {
        ClearLastResult();
 
-       return Variant(__tokenColor[EXPANDABLE_EDIT_AREA_TOKEN_STATUS_SELECTED]);
+       return Variant(__tokenColor[TOKEN_EDIT_STATUS_SELECTED]);
+}
+
+result
+_TokenEdit::SetPropertyHighlightedTokenColor(const Variant& color)
+{
+       ClearLastResult();
+
+       __tokenColor[TOKEN_EDIT_STATUS_HIGHLIGHTED] = color.ToColor();
+
+       return E_SUCCESS;
+}
+
+Variant
+_TokenEdit::GetPropertyHighlightedTokenColor(void) const
+{
+       ClearLastResult();
+
+       return Variant(__tokenColor[TOKEN_EDIT_STATUS_HIGHLIGHTED]);
+}
+
+result
+_TokenEdit::SetPropertyDisabledTokenColor(const Variant& color)
+{
+       ClearLastResult();
+
+       __tokenColor[TOKEN_EDIT_STATUS_DISABLED] = color.ToColor();
+
+       return E_SUCCESS;
+}
+
+Variant
+_TokenEdit::GetPropertyDisabledTokenColor(void) const
+{
+       ClearLastResult();
+
+       return Variant(__tokenColor[TOKEN_EDIT_STATUS_DISABLED]);
 }
 
 result

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();
        }

diff --git a/src/ui/inc/FUiCtrl_TokenEdit.h b/src/ui/inc/FUiCtrl_TokenEdit.h
index 6865c33..671e96a 100644 (file)
--- a/src/ui/inc/FUiCtrl_TokenEdit.h
+++ b/src/ui/inc/FUiCtrl_TokenEdit.h
@@ -37,7 +37,22 @@ namespace Tizen { namespace Ui { namespace Controls
 {
 class _TokenEditPresenter;
 
-const int TOKEN_COLOR_MAX = 2;
+const int TOKEN_COLOR_MAX = 4;
+
+/**
+ * @enum TokenEditStatus
+ *
+ * Defines the possible Token Edit's states.
+ *
+ * @since              2.2
+ */
+enum TokenEditStatus
+{
+       TOKEN_EDIT_STATUS_NORMAL,         /**< The normal state */
+       TOKEN_EDIT_STATUS_SELECTED,         /**< The selected state */
+       TOKEN_EDIT_STATUS_HIGHLIGHTED,    /**< The highlighted state */
+       TOKEN_EDIT_STATUS_DISABLED       /**< The disabled state */
+};
 
 class _TokenEdit
        : virtual public Tizen::Base::Runtime::IEventListener
@@ -58,6 +73,8 @@ public:
        DECLARE_CLASS_BEGIN(_TokenEdit, _Edit);
        DECLARE_PROPERTY("normalTokenColor", GetPropertyNormalTokenColor, SetPropertyNormalTokenColor);
        DECLARE_PROPERTY("selectedTokenColor", GetPropertySelectedTokenColor, SetPropertySelectedTokenColor);
+       DECLARE_PROPERTY("highlightedTokenColor", GetPropertyHighlightedTokenColor, SetPropertyHighlightedTokenColor);
+       DECLARE_PROPERTY("disabledTokenColor", GetPropertyDisabledTokenColor, SetPropertyDisabledTokenColor);
        DECLARE_PROPERTY("tokenTextColor", GetPropertyTokenTextColor, SetPropertyTokenTextColor);
        DECLARE_PROPERTY("selectedTokenTextColor", GetPropertySelectedTokenTextColor, SetPropertySelectedTokenTextColor);
        DECLARE_PROPERTY("tokenEditModeEnabled", GetPropertyTokenEditModeEnabled, SetPropertyTokenEditModeEnabled);
@@ -68,6 +85,10 @@ public:
        Variant GetPropertyNormalTokenColor(void) const;
        result SetPropertySelectedTokenColor(const Variant& color);
        Variant GetPropertySelectedTokenColor(void) const;
+       result SetPropertyHighlightedTokenColor(const Variant& color);
+       Variant GetPropertyHighlightedTokenColor(void) const;
+       result SetPropertyDisabledTokenColor(const Variant& color);
+       Variant GetPropertyDisabledTokenColor(void) const;
        result SetPropertyTokenTextColor(const Variant& color);
        Variant GetPropertyTokenTextColor(void) const;
        result SetPropertySelectedTokenTextColor(const Variant& color);
@@ -87,9 +108,9 @@ public:
        result RemoveTokenAt(int index);
        result SetTokenSelected(int index, bool selected);
        result SetTokenEditModeEnabled(bool enable);
-       Tizen::Graphics::Color GetTokenColor(ExpandableEditAreaTokenStatus status) const;
+       Tizen::Graphics::Color GetTokenColor(TokenEditStatus status) const;
        Tizen::Graphics::Color GetTokenTextColor(void) const;
-       result SetTokenColor(ExpandableEditAreaTokenStatus status, const Tizen::Graphics::Color& color);
+       result SetTokenColor(TokenEditStatus status, const Tizen::Graphics::Color& color);
        result SetTokenTextColor(const Tizen::Graphics::Color& color);
        Tizen::Graphics::Color GetSelectedTokenTextColor(void) const;
        result SetSelectedTokenTextColor(const Tizen::Graphics::Color& color);

diff --git a/src/ui/inc/FUiCtrl_TokenEditPresenter.h b/src/ui/inc/FUiCtrl_TokenEditPresenter.h
index 9df3e97..80e43a4 100644 (file)
--- a/src/ui/inc/FUiCtrl_TokenEditPresenter.h
+++ b/src/ui/inc/FUiCtrl_TokenEditPresenter.h
@@ -29,6 +29,7 @@
 #include <FBaseCharacter.h>
 #include "FUiCtrl_EditPresenter.h"
 #include "FUiCtrl_TokenEditModel.h"
+#include "FUiCtrl_TokenEdit.h"
 
 namespace Tizen { namespace Ui { namespace Controls
 {
@@ -179,8 +180,8 @@ public:
 
 private:
        bool DrawToken(int count = -1);
-       Tizen::Graphics::Color GetTokenEditColor(const ExpandableEditAreaTokenStatus status) const;
-       Tizen::Graphics::Color GetTokenEditTextColor(const ExpandableEditAreaTokenStatus status) const;
+       Tizen::Graphics::Color GetTokenEditColor(const TokenEditStatus status) const;
+       Tizen::Graphics::Color GetTokenEditTextColor(const TokenEditStatus status) const;
        result InitializeTokenVisibilityAt(int index);
        bool DrawDescriptionText(void);
        result SetDescriptionTextRect(const Tizen::Graphics::FloatRectangle& rect);