From: Syed Khaja Moinuddin Date: Mon, 13 May 2013 10:05:51 +0000 (+0900) Subject: Moving the 1.x List specific resources to List config X-Git-Tag: submit/tizen_2.1/20130515.031821~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e9bc6c791f97a664c61019594b2a38da2d0fdaf0;p=framework%2Fosp%2Fuifw.git Moving the 1.x List specific resources to List config Signed-off-by: Syed Khaja Moinuddin Change-Id: I88e6fe8ac255ed07d82457c1aa846e3cfdebf0e3 Signed-off-by: Syed Khaja Moinuddin --- diff --git a/src/ui/controls/FUiCtrl_ExpandableListImpl.cpp b/src/ui/controls/FUiCtrl_ExpandableListImpl.cpp index 5ec55c4..8eb35d6 100644 --- a/src/ui/controls/FUiCtrl_ExpandableListImpl.cpp +++ b/src/ui/controls/FUiCtrl_ExpandableListImpl.cpp @@ -601,9 +601,9 @@ _ExpandableListImpl::LoadArrowBitmap(void) Color disabledColor; Color pressedColor; - GET_COLOR_CONFIG(TABLEVIEW::EXPANDABLE_ARROW_NORMAL, normalColor); - GET_COLOR_CONFIG(TABLEVIEW::EXPANDABLE_ARROW_DISABLED, disabledColor); - GET_COLOR_CONFIG(TABLEVIEW::EXPANDABLE_ARROW_PRESSED, pressedColor); + GET_COLOR_CONFIG(LIST::EXPANDABLE_ARROW_NORMAL, normalColor); + GET_COLOR_CONFIG(LIST::EXPANDABLE_ARROW_DISABLED, disabledColor); + GET_COLOR_CONFIG(LIST::EXPANDABLE_ARROW_PRESSED, pressedColor); r = GET_BITMAP_CONFIG_N(LIST::BUTTON_COLLAPSE_GROUP, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap); SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Failed to fetch Arrow Bitmap"); @@ -623,10 +623,10 @@ _ExpandableListImpl::LoadArrowBitmap(void) delete pTempBitmap; pTempBitmap = null; - r = GET_BITMAP_CONFIG_N(TABLEVIEW::BUTTON_EXPAND_CLOSED_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, __pEffectOpenedImage); + r = GET_BITMAP_CONFIG_N(LIST::BUTTON_EXPAND_CLOSED_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, __pEffectOpenedImage); SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Failed to fetch Arrow effect Bitmap"); - r = GET_BITMAP_CONFIG_N(TABLEVIEW::BUTTON_EXPAND_OPENED_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, __pEffectClosedImage); + r = GET_BITMAP_CONFIG_N(LIST::BUTTON_EXPAND_OPENED_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, __pEffectClosedImage); SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Failed to fetch Arrow effect Bitmap"); return r; diff --git a/src/ui/controls/FUiCtrl_ListBaseImpl.cpp b/src/ui/controls/FUiCtrl_ListBaseImpl.cpp index 7ba002b..88b32f9 100644 --- a/src/ui/controls/FUiCtrl_ListBaseImpl.cpp +++ b/src/ui/controls/FUiCtrl_ListBaseImpl.cpp @@ -77,8 +77,6 @@ _ListBaseImpl::CreateMergedBitmapN(Bitmap& pNormalBitmap, Bitmap* pSelectedBitma Canvas* pCanvas = null; Rectangle bitmapBounds; - Color canvasBackgroundColor; - result r = E_SUCCESS; bitmapBounds = Rectangle(0, 0, pNormalBitmap.GetWidth(), pNormalBitmap.GetHeight()); @@ -86,10 +84,8 @@ _ListBaseImpl::CreateMergedBitmapN(Bitmap& pNormalBitmap, Bitmap* pSelectedBitma pCanvas = new (std::nothrow) Canvas(); SysTryReturn(NID_UI_CTRL, pCanvas != null, null, E_OUT_OF_MEMORY, "Memory allocation failed."); - GET_COLOR_CONFIG(TABLEVIEW::ITEM_ANNEX_CANVAS_BG_NORMAL, canvasBackgroundColor); - pCanvas->Construct(bitmapBounds); - pCanvas->SetBackgroundColor(Color(canvasBackgroundColor.GetRed(), canvasBackgroundColor.GetGreen(), canvasBackgroundColor.GetBlue(), 0)); + pCanvas->SetBackgroundColor(Color(0, 0, 0, 0)); pCanvas->Clear(); if (_BitmapImpl::CheckNinePatchedBitmapStrictly(pNormalBitmap)) @@ -138,11 +134,8 @@ _ListBaseImpl::CreateOnOffMergedBitmapN(Bitmap& pNormalBitmap, Bitmap& pSelected Canvas* pCanvas = null; Rectangle bitmapBounds; - - result r = E_SUCCESS; - Rectangle handlerBounds; - Color canvasBackgroundColor; + result r = E_SUCCESS; bitmapBounds = Rectangle(0, 0, pNormalBitmap.GetWidth(), pNormalBitmap.GetHeight()); @@ -161,10 +154,8 @@ _ListBaseImpl::CreateOnOffMergedBitmapN(Bitmap& pNormalBitmap, Bitmap& pSelected pCanvas = new (std::nothrow) Canvas(); SysTryReturn(NID_UI_CTRL, pCanvas != null, null, E_OUT_OF_MEMORY, "Memory allocation failed."); - GET_COLOR_CONFIG(TABLEVIEW::ITEM_ANNEX_CANVAS_BG_NORMAL, canvasBackgroundColor); - pCanvas->Construct(bitmapBounds); - pCanvas->SetBackgroundColor(Color(canvasBackgroundColor.GetRed(), canvasBackgroundColor.GetGreen(), canvasBackgroundColor.GetBlue(), 0)); + pCanvas->SetBackgroundColor(Color(0, 0, 0, 0)); pCanvas->Clear(); if (_BitmapImpl::CheckNinePatchedBitmapStrictly(pNormalBitmap)) diff --git a/src/ui/inc/FUi_ResourceListConfig.h b/src/ui/inc/FUi_ResourceListConfig.h index 209d8c3..c4bb556 100644 --- a/src/ui/inc/FUi_ResourceListConfig.h +++ b/src/ui/inc/FUi_ResourceListConfig.h @@ -32,15 +32,13 @@ DECLARE_UI_CONFIG(LIST); DECLARE_COLOR_CONFIG(ELEMENT_TEXT_PRESSED, 5); DECLARE_COLOR_CONFIG(ELEMENT_TEXT_HIGHLIGHTED, 6); DECLARE_COLOR_CONFIG(ELEMENT_TEXT_DISABLED, 7); - DECLARE_IMAGE_CONFIG(CHECK_BG_BITMAP, 1); - DECLARE_IMAGE_CONFIG(CHECK_MARK_BG_BITMAP, 2); - DECLARE_IMAGE_CONFIG(CHECK_DIM_BITMAP, 3); - DECLARE_IMAGE_CONFIG(BUTTON_RADIO_BITMAP, 4); - DECLARE_IMAGE_CONFIG(BUTTON_RADIO_SELECTED_BITMAP, 5); - DECLARE_IMAGE_CONFIG(BUTTON_OFF_BITMAP, 6); - DECLARE_IMAGE_CONFIG(BUTTON_ON_BITMAP, 7); - DECLARE_IMAGE_CONFIG(BUTTON_EXPAND_GROUP, 8); - DECLARE_IMAGE_CONFIG(BUTTON_COLLAPSE_GROUP, 9); + DECLARE_COLOR_CONFIG(EXPANDABLE_ARROW_NORMAL, 8); + DECLARE_COLOR_CONFIG(EXPANDABLE_ARROW_DISABLED, 9); + DECLARE_COLOR_CONFIG(EXPANDABLE_ARROW_PRESSED, 10); + DECLARE_IMAGE_CONFIG(BUTTON_EXPAND_GROUP, 1); + DECLARE_IMAGE_CONFIG(BUTTON_COLLAPSE_GROUP, 2); + DECLARE_IMAGE_CONFIG(BUTTON_EXPAND_CLOSED_EFFECT, 3); + DECLARE_IMAGE_CONFIG(BUTTON_EXPAND_OPENED_EFFECT, 4); DECLARE_SHAPE_CONFIG(EMPTY_LIST_TEXT_HEIGHT, 1); DECLARE_SHAPE_CONFIG(LIST_ITEM_TEXT_SIZE, 2); DECLARE_SHAPE_CONFIG(LIST_STYLE_NUMBER_X, 3); diff --git a/src/ui/inc/FUi_ResourceTableViewConfig.h b/src/ui/inc/FUi_ResourceTableViewConfig.h index 7354cc9..38e6ef2 100644 --- a/src/ui/inc/FUi_ResourceTableViewConfig.h +++ b/src/ui/inc/FUi_ResourceTableViewConfig.h @@ -26,9 +26,9 @@ DECLARE_UI_CONFIG(TABLEVIEW); DECLARE_COLOR_CONFIG(BG_NORMAL, 1); - DECLARE_COLOR_CONFIG(EXPANDABLE_ARROW_NORMAL, 2); - DECLARE_COLOR_CONFIG(EXPANDABLE_ARROW_DISABLED, 3); - DECLARE_COLOR_CONFIG(EXPANDABLE_ARROW_PRESSED, 4); +// DECLARE_COLOR_CONFIG(EXPANDABLE_ARROW_NORMAL, 2); +// DECLARE_COLOR_CONFIG(EXPANDABLE_ARROW_DISABLED, 3); +// DECLARE_COLOR_CONFIG(EXPANDABLE_ARROW_PRESSED, 4); DECLARE_COLOR_CONFIG(ITEM_DIVIDER_TOP_BG_NORMAL, 5); DECLARE_COLOR_CONFIG(ITEM_DIVIDER_BOTTOM_BG_NORMAL, 6); DECLARE_COLOR_CONFIG(ITEM_BG_NORMAL, 7); @@ -97,8 +97,8 @@ DECLARE_UI_CONFIG(TABLEVIEW); DECLARE_IMAGE_CONFIG(CIRCLE_BUTTON_BG_EFFECT, 32); // DECLARE_IMAGE_CONFIG(CIRCLE_BUTTON_REVEAL, 33); DECLARE_IMAGE_CONFIG(SEARCH_ICON_NORMAL, 34); - DECLARE_IMAGE_CONFIG(BUTTON_EXPAND_CLOSED_EFFECT, 35); - DECLARE_IMAGE_CONFIG(BUTTON_EXPAND_OPENED_EFFECT, 36); +// DECLARE_IMAGE_CONFIG(BUTTON_EXPAND_CLOSED_EFFECT, 35); +// DECLARE_IMAGE_CONFIG(BUTTON_EXPAND_OPENED_EFFECT, 36); DECLARE_IMAGE_CONFIG(CHECKBOX_BG_DISABLED, 37); DECLARE_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_DISABLED, 38); DECLARE_IMAGE_CONFIG(RADIOBUTTON_NORMAL_DISABLED, 39); diff --git a/src/ui/resource/FUi_ResourceConfigParser.cpp b/src/ui/resource/FUi_ResourceConfigParser.cpp index c73b75e..05089ca 100644 --- a/src/ui/resource/FUi_ResourceConfigParser.cpp +++ b/src/ui/resource/FUi_ResourceConfigParser.cpp @@ -3908,18 +3908,6 @@ ConfigParser::GetColorKeyTable(void) __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::BG_NORMAL_COLOR); } { - const char* key ="TABLEVIEW::EXPANDABLE_ARROW_NORMAL"; - __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::EXPANDABLE_ARROW_NORMAL_COLOR); - } - { - const char* key ="TABLEVIEW::EXPANDABLE_ARROW_DISABLED"; - __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::EXPANDABLE_ARROW_DISABLED_COLOR); - } - { - const char* key ="TABLEVIEW::EXPANDABLE_ARROW_PRESSED"; - __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::EXPANDABLE_ARROW_PRESSED_COLOR); - } - { const char* key ="TABLEVIEW::ITEM_DIVIDER_TOP_BG_NORMAL"; __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::ITEM_DIVIDER_TOP_BG_NORMAL_COLOR); } diff --git a/src/ui/resource/FUi_ResourceListConfig.cpp b/src/ui/resource/FUi_ResourceListConfig.cpp index c693e36..fe2b6aa 100644 --- a/src/ui/resource/FUi_ResourceListConfig.cpp +++ b/src/ui/resource/FUi_ResourceListConfig.cpp @@ -28,12 +28,17 @@ START_UI_CONFIG(LIST); ADD_COLOR_CONFIG(LISTITEM_DIVIDER_LEFT_HALF_COLOR, $B0223); ADD_COLOR_CONFIG(LISTITEM_DIVIDER_RIGHT_HALF_COLOR, $B0222); ADD_COLOR_CONFIG(EXPANDABLELIST_SUB_ITEM_BG_COLOR, $B0217); + ADD_COLOR_CONFIG(EXPANDABLE_ARROW_NORMAL, $F032L1); + ADD_COLOR_CONFIG(EXPANDABLE_ARROW_DISABLED, $F032L1D); + ADD_COLOR_CONFIG(EXPANDABLE_ARROW_PRESSED, $F032L1P); ADD_COLOR_CONFIG(ELEMENT_TEXT_NORMAL, $F011L1); ADD_COLOR_CONFIG(ELEMENT_TEXT_PRESSED, $F011L1P); ADD_COLOR_CONFIG(ELEMENT_TEXT_HIGHLIGHTED, $F011L1P); ADD_COLOR_CONFIG(ELEMENT_TEXT_DISABLED, $F011L1D); ADD_IMAGE_CONFIG(BUTTON_EXPAND_GROUP, #00_button_expand_opened.png); ADD_IMAGE_CONFIG(BUTTON_COLLAPSE_GROUP, #00_button_expand_closed.png); + ADD_IMAGE_CONFIG(BUTTON_EXPAND_CLOSED_EFFECT, #00_button_expand_closed_ef.png); + ADD_IMAGE_CONFIG(BUTTON_EXPAND_OPENED_EFFECT, #00_button_expand_opened_ef.png); START_UI_CONFIG_MODE(720x1280); ADD_SHAPE_CONFIG(EMPTY_LIST_TEXT_HEIGHT, 38); diff --git a/src/ui/resource/FUi_ResourceTableViewConfig.cpp b/src/ui/resource/FUi_ResourceTableViewConfig.cpp index 2016352..89f4864 100644 --- a/src/ui/resource/FUi_ResourceTableViewConfig.cpp +++ b/src/ui/resource/FUi_ResourceTableViewConfig.cpp @@ -25,9 +25,6 @@ START_UI_CONFIG(TABLEVIEW); { ADD_COLOR_CONFIG(BG_NORMAL, 0x00000000); - ADD_COLOR_CONFIG(EXPANDABLE_ARROW_NORMAL, $F032L1); - ADD_COLOR_CONFIG(EXPANDABLE_ARROW_DISABLED, $F032L1D); - ADD_COLOR_CONFIG(EXPANDABLE_ARROW_PRESSED, $F032L1P); ADD_COLOR_CONFIG(ITEM_DIVIDER_TOP_BG_NORMAL, $B0222); ADD_COLOR_CONFIG(ITEM_DIVIDER_BOTTOM_BG_NORMAL, $B0223); ADD_COLOR_CONFIG(ITEM_BG_NORMAL, 0x00000000); @@ -105,8 +102,6 @@ START_UI_CONFIG(TABLEVIEW); ADD_IMAGE_CONFIG(CIRCLE_BUTTON_BG_EFFECT_DISABLED, #00_circle_bg_ef_dim.png); ADD_IMAGE_CONFIG(CIRCLE_BUTTON_REVEAL_NORMAL, #00_button_right.png); ADD_IMAGE_CONFIG(SEARCH_ICON_NORMAL, #00_search_icon.png); - ADD_IMAGE_CONFIG(BUTTON_EXPAND_CLOSED_EFFECT, #00_button_expand_closed_ef.png); - ADD_IMAGE_CONFIG(BUTTON_EXPAND_OPENED_EFFECT, #00_button_expand_opened_ef.png); ADD_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_PRESSED, #00_check_press.png); ADD_IMAGE_CONFIG(CIRCLE_BUTTON_REVEAL_PRESSED, #00_button_right.png); ADD_IMAGE_CONFIG(CIRCLE_BUTTON_REVEAL_HIGHLIGHTED, #00_button_right.png);