GuideText Color settings in SB as per new UX

Change-Id: I81030b1067f2477f7302bd4c939d3e8f641b7b6a
Signed-off-by: Ayush <ayush.sriv@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_Edit.cpp b/src/ui/controls/FUiCtrl_Edit.cpp
index 05f0ebf..b1db30e 100644 (file)
--- a/src/ui/controls/FUiCtrl_Edit.cpp
+++ b/src/ui/controls/FUiCtrl_Edit.cpp
@@ -2729,20 +2729,6 @@ _Edit::SetCursorDisabled(bool disabled)
        return;
 }
 
-void
-_Edit::SetPressedGuideTextColor(const Color& color)
-{
-       __pressedGuideTextColor = color;
-
-       return;
-}
-
-Color
-_Edit::GetPressedGuideTextColor(void) const
-{
-       return __pressedGuideTextColor;
-}
-
 result
 _Edit::SetPropertyAutoResizingEnabled(const Variant& enable)
 {

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index 6af14ba..2e4a809 100755 (executable)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -1695,14 +1695,6 @@ _EditPresenter::DrawTextForEntireFontSetting(Canvas& canvas)
        {
                __pGuideTextObject->SetForegroundColor(__pEdit->GetGuideTextColor(), 0, __pGuideTextObject->GetTextLength());
 
-               if (GetSearchBarFlag())
-               {
-                       if (__isTouchPressed)
-                       {
-                               __pGuideTextObject->SetForegroundColor(__pEdit->GetPressedGuideTextColor(), 0, __pGuideTextObject->GetTextLength());
-                       }
-               }
-
                if (__isGuideTextColorChanged == true && __pEdit->IsSettingGuideTextColor() == false)
                {
                        __pGuideTextObject->SetForegroundColor(__pEdit->GetTextColor(EDIT_STATUS_NORMAL), 0, __pGuideTextObject->GetTextLength());

diff --git a/src/ui/controls/FUiCtrl_SearchBar.cpp b/src/ui/controls/FUiCtrl_SearchBar.cpp
index 6e2c1b6..edbbf79 100644 (file)
--- a/src/ui/controls/FUiCtrl_SearchBar.cpp
+++ b/src/ui/controls/FUiCtrl_SearchBar.cpp
@@ -66,6 +66,7 @@ _SearchBar::_SearchBar(void)
        , __isUsableCancelButton(false)
        , __isUserContainerBounds(false)
        , __isCancelActionInProgress(false)
+       , __isUserGuideTextColor(false)
        , __keypadAction(CORE_KEYPAD_ACTION_SEARCH)
        , __pBackgroundBitmap(null)
        , __backgroundColor(Color())
@@ -211,15 +212,18 @@ _SearchBar::Initialize(bool enableSearchBarButton, CoreKeypadAction keypadAction
                {
                case SEARCH_FIELD_STATUS_DISABLED:
                        GET_COLOR_CONFIG(SEARCHBAR::EDIT_BG_DISABLED, __color[i]);
+                       GET_COLOR_CONFIG(SEARCHBAR::EDIT_TEXT_DISABLED, __textColor[i]);
                        GET_COLOR_CONFIG(SEARCHBAR::GUIDE_TEXT_DISABLED, __guideTextColor[i]);
                        break;
 
                case SEARCH_FIELD_STATUS_HIGHLIGHTED:
                        GET_COLOR_CONFIG(SEARCHBAR::EDIT_BG_NORMAL, __color[i]);
+                       GET_COLOR_CONFIG(SEARCHBAR::EDIT_TEXT_HIGHLIGHTED, __textColor[i]);
                        GET_COLOR_CONFIG(SEARCHBAR::GUIDE_TEXT_HIGHLIGHTED, __guideTextColor[i]);
                        break;
                default:
                        GET_COLOR_CONFIG(SEARCHBAR::EDIT_BG_NORMAL, __color[i]);
+                       GET_COLOR_CONFIG(SEARCHBAR::EDIT_TEXT_NORMAL, __textColor[i]);
                        GET_COLOR_CONFIG(SEARCHBAR::GUIDE_TEXT_NORMAL, __guideTextColor[i]);
                        break;
                }
@@ -303,7 +307,6 @@ _SearchBar::CreateSearchField(void)
        editBounds.width = (editBounds.width > searchFieldMinWidth) ? editBounds.width : searchFieldMinWidth;
        editBounds.height = (editBounds.height > searchFieldMinHeight) ? editBounds.height : searchFieldMinHeight;
 
-
        __pEdit = _Edit::CreateEditN();
        r = GetLastResult();
        SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
@@ -331,8 +334,11 @@ _SearchBar::CreateSearchField(void)
                __pEdit->SetColor(editStatus, __color[status]);
        }
 
+       __pEdit->SetTextColor(EDIT_TEXT_COLOR_NORMAL, __textColor[SEARCH_FIELD_STATUS_NORMAL]);
+       __pEdit->SetTextColor(EDIT_TEXT_COLOR_DISABLED, __textColor[SEARCH_FIELD_STATUS_DISABLED]);
+       __pEdit->SetTextColor(EDIT_TEXT_COLOR_HIGHLIGHTED, __textColor[SEARCH_FIELD_STATUS_HIGHLIGHTED]);
+
        __pEdit->ReplaceDefaultBackgroundBitmapForSearchBar();
-       __pEdit->SetPressedGuideTextColor(__guideTextColor[SEARCH_FIELD_STATUS_HIGHLIGHTED]);
 
        __pEdit->SetKeypadAction(__keypadAction);
 
@@ -1239,6 +1245,7 @@ _SearchBar::SetGuideTextColor(const Color& color)
        SysTryReturn(NID_UI_CTRL, __pEdit, E_SYSTEM, E_SYSTEM,
                     "[E_SYSTEM] A system error has occurred. The edit instance is null.");
 
+       __isUserGuideTextColor = true;
        return __pEdit->SetGuideTextColor(color);
 }
 
@@ -1544,8 +1551,11 @@ _SearchBar::OnChangeLayout(_ControlOrientation orientation)
 void
 _SearchBar::OnDraw(void)
 {
-       SearchFieldStatus searchFieldStatus = GetCurrentStatus();
-       SetGuideTextColor(__guideTextColor[searchFieldStatus]);
+       if (!__isUserGuideTextColor)
+       {
+               SearchFieldStatus status = GetCurrentStatus();
+               __pEdit->SetGuideTextColor(__guideTextColor[status]);
+       }
 
        __pSearchBarPresenter->Draw();
        return;

diff --git a/src/ui/inc/FUiCtrl_Edit.h b/src/ui/inc/FUiCtrl_Edit.h
index aa8e947..2fb97d0 100644 (file)
--- a/src/ui/inc/FUiCtrl_Edit.h
+++ b/src/ui/inc/FUiCtrl_Edit.h
@@ -397,8 +397,6 @@ public:
        result DeleteCharacterAt(int index);
        result DeleteCharacterAtCursorPosition(void);
        void SetCursorDisabled(bool disabled);
-       void SetPressedGuideTextColor(const Tizen::Graphics::Color& color);
-       Tizen::Graphics::Color GetPressedGuideTextColor(void) const;
        result HideKeypad(void);
        void InitializeColorInformation(void);
        void SetViewModeColorInformation(bool enabled);

diff --git a/src/ui/inc/FUiCtrl_SearchBar.h b/src/ui/inc/FUiCtrl_SearchBar.h
index c50cc81..750fcf9 100644 (file)
--- a/src/ui/inc/FUiCtrl_SearchBar.h
+++ b/src/ui/inc/FUiCtrl_SearchBar.h
@@ -291,6 +291,7 @@ private:
        bool __isUsableCancelButton;
        bool __isUserContainerBounds;
        bool __isCancelActionInProgress;
+       bool __isUserGuideTextColor;
 
        CoreKeypadAction __keypadAction;
 

diff --git a/src/ui/resource/FUi_ResourceSearchBarConfig.cpp b/src/ui/resource/FUi_ResourceSearchBarConfig.cpp
index da2cbac..40c833e 100644 (file)
--- a/src/ui/resource/FUi_ResourceSearchBarConfig.cpp
+++ b/src/ui/resource/FUi_ResourceSearchBarConfig.cpp
@@ -37,7 +37,10 @@ START_UI_CONFIG(SEARCHBAR);
        ADD_COLOR_CONFIG(EDIT_BG_DISABLED, $W031D);
        ADD_COLOR_CONFIG(GUIDE_TEXT_NORMAL, $W032);
        ADD_COLOR_CONFIG(GUIDE_TEXT_DISABLED, $W032D);
-       ADD_COLOR_CONFIG(GUIDE_TEXT_HIGHLIGHTED, $W032P);
+       ADD_COLOR_CONFIG(GUIDE_TEXT_HIGHLIGHTED, $W032);
+       ADD_COLOR_CONFIG(EDIT_TEXT_NORMAL, $W032P);
+       ADD_COLOR_CONFIG(EDIT_TEXT_DISABLED, $W032D);
+       ADD_COLOR_CONFIG(EDIT_TEXT_HIGHLIGHTED, $W032P);
        ADD_COLOR_CONFIG(ICON_BG_NORMAL, $F041i);
        ADD_COLOR_CONFIG(ICON_BG_DISABLED, $F041iD);
        ADD_COLOR_CONFIG(CONTENT_AREA_BG_NORMAL, $B013);