From e99874abd5d99892d297bf55f9d92a2f5a2bd1e4 Mon Sep 17 00:00:00 2001 From: Ayush Date: Tue, 4 Jun 2013 19:12:31 +0530 Subject: [PATCH] Reverting SB config changes Change-Id: Iab03cd83a22a8022ca8ba8b37fe56da03338ddcd Signed-off-by: Ayush --- inc/FUiUiConfigurationTypes.h | 21 --------------------- src/ui/FUiUiConfiguration.cpp | 3 --- src/ui/controls/FUiCtrl_EditPresenter.cpp | 2 +- src/ui/inc/FUi_ResourceSearchBarConfig.h | 3 --- src/ui/resource/FUi_ResourceConfigParser.cpp | 12 ------------ src/ui/resource/FUi_ResourceSearchBarConfig.cpp | 3 --- 6 files changed, 1 insertion(+), 43 deletions(-) diff --git a/inc/FUiUiConfigurationTypes.h b/inc/FUiUiConfigurationTypes.h index 379fbef..d1365f1 100644 --- a/inc/FUiUiConfigurationTypes.h +++ b/inc/FUiUiConfigurationTypes.h @@ -2533,20 +2533,6 @@ struct _OSP_EXPORT_ ColorKey _OSP_EXPORT_ static const int EDIT_BG_NORMAL; /** - * The property key to get the pressed background color of the edit of search bar. - * - * @since 2.1 - */ - _OSP_EXPORT_ static const int EDIT_BG_PRESSED; - - /** - * The property key to get the highlighted background color of the edit of search bar. - * - * @since 2.1 - */ - _OSP_EXPORT_ static const int EDIT_BG_HIGHLIGHTED; - - /** * The property key to get the disabled background color of the edit of search bar. * * @since 2.1 @@ -2554,13 +2540,6 @@ struct _OSP_EXPORT_ ColorKey _OSP_EXPORT_ static const int EDIT_BG_DISABLED; /** - * The property key to get the focus color of the edit of search bar. - * - * @since 2.1 - */ - _OSP_EXPORT_ static const int EDIT_BG_FOCUS; - - /** * The property key to get the normal text color of the edit of search bar. * * @since 2.1 diff --git a/src/ui/FUiUiConfiguration.cpp b/src/ui/FUiUiConfiguration.cpp index 3f66b71..7e5c45e 100644 --- a/src/ui/FUiUiConfiguration.cpp +++ b/src/ui/FUiUiConfiguration.cpp @@ -374,10 +374,7 @@ const int ColorKey::SearchBar::BUTTON_TEXT_PRESSED = _SEARCHBAR::BUTTON_TEXT_PRE const int ColorKey::SearchBar::BUTTON_TEXT_DISABLED = _SEARCHBAR::BUTTON_TEXT_DISABLED_COLOR; const int ColorKey::SearchBar::BUTTON_TEXT_HIGHLIGHTED = _SEARCHBAR::BUTTON_TEXT_HIGHLIGHTED_COLOR; const int ColorKey::SearchBar::EDIT_BG_NORMAL = _SEARCHBAR::EDIT_BG_NORMAL_COLOR; -const int ColorKey::SearchBar::EDIT_BG_PRESSED = _SEARCHBAR::EDIT_BG_PRESSED_COLOR; -const int ColorKey::SearchBar::EDIT_BG_HIGHLIGHTED = _SEARCHBAR::EDIT_BG_HIGHLIGHTED_COLOR; const int ColorKey::SearchBar::EDIT_BG_DISABLED = _SEARCHBAR::EDIT_BG_DISABLED_COLOR; -const int ColorKey::SearchBar::EDIT_BG_FOCUS = _SEARCHBAR::EDIT_BG_FOCUS_COLOR; const int ColorKey::SearchBar::EDIT_TEXT_NORMAL = _SEARCHBAR::EDIT_TEXT_NORMAL_COLOR; const int ColorKey::SearchBar::EDIT_TEXT_DISABLED = _SEARCHBAR::EDIT_TEXT_DISABLED_COLOR; const int ColorKey::SearchBar::EDIT_TEXT_HIGHLIGHTED = _SEARCHBAR::EDIT_TEXT_HIGHLIGHTED_COLOR; diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp index a78610d..66ee94d 100755 --- a/src/ui/controls/FUiCtrl_EditPresenter.cpp +++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp @@ -1588,7 +1588,7 @@ _EditPresenter::DrawChangeableBackground(Canvas& canvas, bool focused, int bitma Bitmap* pReplacementColorFocusBitmap = null; Color focusColor; - GET_COLOR_CONFIG(SEARCHBAR::EDIT_BG_FOCUS, focusColor); + GET_COLOR_CONFIG(BUTTON::BG_HIGHLIGHTED, focusColor); pFocusBitmap = __pEdit->GetDefaultFocusBitmap(); diff --git a/src/ui/inc/FUi_ResourceSearchBarConfig.h b/src/ui/inc/FUi_ResourceSearchBarConfig.h index 0591c92..f7cd7ad 100644 --- a/src/ui/inc/FUi_ResourceSearchBarConfig.h +++ b/src/ui/inc/FUi_ResourceSearchBarConfig.h @@ -44,9 +44,6 @@ DECLARE_UI_CONFIG(SEARCHBAR); DECLARE_COLOR_CONFIG(EDIT_TEXT_NORMAL, 17); DECLARE_COLOR_CONFIG(EDIT_TEXT_DISABLED, 18); DECLARE_COLOR_CONFIG(EDIT_TEXT_HIGHLIGHTED, 19); - DECLARE_COLOR_CONFIG(EDIT_BG_FOCUS, 20); - DECLARE_COLOR_CONFIG(EDIT_BG_PRESSED, 21); - DECLARE_COLOR_CONFIG(EDIT_BG_HIGHLIGHTED, 22); DECLARE_IMAGE_CONFIG(EDIT_BG_NORMAL, 1); DECLARE_IMAGE_CONFIG(EDIT_BG_DISABLED, 2); DECLARE_IMAGE_CONFIG(EDIT_BG_HIGHLIGHTED, 3); diff --git a/src/ui/resource/FUi_ResourceConfigParser.cpp b/src/ui/resource/FUi_ResourceConfigParser.cpp index 78a1e5b..3706bfb 100644 --- a/src/ui/resource/FUi_ResourceConfigParser.cpp +++ b/src/ui/resource/FUi_ResourceConfigParser.cpp @@ -3728,18 +3728,6 @@ ConfigParser::GetColorKeyTable(void) __pColorKeyTable->Add(ResourceKey(key), _SEARCHBAR::EDIT_BG_NORMAL_COLOR); } { - const char* key ="SEARCHBAR::EDIT_BG_PRESSED"; - __pColorKeyTable->Add(ResourceKey(key), _SEARCHBAR::EDIT_BG_PRESSED_COLOR); - } - { - const char* key ="SEARCHBAR::EDIT_BG_HIGHLIGHTED"; - __pColorKeyTable->Add(ResourceKey(key), _SEARCHBAR::EDIT_BG_HIGHLIGHTED_COLOR); - } - { - const char* key ="SEARCHBAR::EDIT_BG_FOCUS"; - __pColorKeyTable->Add(ResourceKey(key), _SEARCHBAR::EDIT_BG_FOCUS_COLOR); - } - { const char* key ="SEARCHBAR::EDIT_BG_DISABLED"; __pColorKeyTable->Add(ResourceKey(key), _SEARCHBAR::EDIT_BG_DISABLED_COLOR); } diff --git a/src/ui/resource/FUi_ResourceSearchBarConfig.cpp b/src/ui/resource/FUi_ResourceSearchBarConfig.cpp index 1954166..f3e3b8e 100644 --- a/src/ui/resource/FUi_ResourceSearchBarConfig.cpp +++ b/src/ui/resource/FUi_ResourceSearchBarConfig.cpp @@ -34,10 +34,7 @@ START_UI_CONFIG(SEARCHBAR); ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L4); ADD_COLOR_CONFIG(EDIT_BG_NORMAL, $W031); - ADD_COLOR_CONFIG(EDIT_BG_PRESSED, $B0217); - ADD_COLOR_CONFIG(EDIT_BG_HIGHLIGHTED, $W031); ADD_COLOR_CONFIG(EDIT_BG_DISABLED, $W031D); - ADD_COLOR_CONFIG(EDIT_BG_FOCUS, $W161); ADD_COLOR_CONFIG(GUIDE_TEXT_NORMAL, $W032); ADD_COLOR_CONFIG(GUIDE_TEXT_DISABLED, $W032D); ADD_COLOR_CONFIG(GUIDE_TEXT_HIGHLIGHTED, $W032); -- 2.7.4