Fixed issue 35973 accepted/tizen_2.1/20130425.023637 submit/tizen_2.1/20130424.224127
authorchitta ranjan <chitta.rs@samsung.com>
Tue, 23 Apr 2013 09:01:38 +0000 (18:01 +0900)
committerchitta ranjan <chitta.rs@samsung.com>
Tue, 23 Apr 2013 09:19:55 +0000 (18:19 +0900)
Change-Id: Ifd0c6a8dbe72cf9781dac9429b1b523f3b63c2ce
Signed-off-by: chitta ranjan <chitta.rs@samsung.com>
src/GlDropDownCustomItem.cpp
src/GlSettingMainForm.cpp

index 5853393..bfcb5e1 100644 (file)
@@ -85,7 +85,6 @@ DropDownCustomItem::Make(void)
        AppLogDebug("DropDownCustomItem::Make entered");
 
        Tizen::Graphics::Bitmap* pDropperBitmapNormal = null;
-       Tizen::Graphics::Bitmap* pDropperBitmapPressed = null;
 
        AddElement(Rectangle(26, 22, __width - 126, 54), IDA_FORMAT_MAIN_STRING,__mainText, 44,
                        CUSTOM_COLOR_TRANSPARENT, CUSTOM_COLOR_TRANSPARENT, CUSTOM_COLOR_TRANSPARENT);
@@ -98,17 +97,15 @@ DropDownCustomItem::Make(void)
                if (GetCurState() == DROP_DOWN_ITEM_STATE_CLOSED)
                {
                        pDropperBitmapNormal = pAppResource->GetBitmapN(IDB_LIST_EXPAND_CLOSED, BITMAP_PIXEL_FORMAT_ARGB8888);
-                       pDropperBitmapPressed = pAppResource->GetBitmapN(IDB_LIST_EXPAND_CLOSED_PRESS, BITMAP_PIXEL_FORMAT_ARGB8888);
                }
                else
                {
                        pDropperBitmapNormal = pAppResource->GetBitmapN(IDB_LIST_EXPAND_OPENED, BITMAP_PIXEL_FORMAT_ARGB8888);
-                       pDropperBitmapPressed = pAppResource->GetBitmapN(IDB_LIST_EXPAND_OPENED_PRESS, BITMAP_PIXEL_FORMAT_ARGB8888);
                }
 
-               AddElement(Rectangle(__width - 95, (__height - 74) / 2, 74, 74), IDA_FORMAT_DROPPER, *pDropperBitmapNormal, pDropperBitmapPressed, pDropperBitmapNormal);
+               AddElement(Rectangle(__width - 95, (__height - 74) / 2, 74, 74), IDA_FORMAT_DROPPER, *pDropperBitmapNormal, pDropperBitmapNormal, pDropperBitmapNormal);
                delete pDropperBitmapNormal;
-               delete pDropperBitmapPressed;
+
        }
 
        return E_SUCCESS;
index 58cbad0..2a80e51 100644 (file)
@@ -413,6 +413,7 @@ SettingMainForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        int effectiveIndex = 0;
        const Color ITEM_BACKGROUND_COLOR = CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND;
        const Color ITEM_RADIO_ITEM_BACKGROUND_COLOR = CUSTOM_COLOR_SETTINGS_LISTITEM_RADIO_BACKGROUND;
+       const Color ITEM_BACKGROUND_COLOR_HIGHLIGHTED = CUSTOM_BACKGROUND_COLOR_LISTVIEW_PRESSED_HIGHLIGHTED;
 
        effectiveIndex = effectiveIndex + itemIndex;
        AppLogDebug("SettingMainForm::CreateItem --> groupIndex : %d, itemIndex: %d itemWidth: %d effectiveIndex %d", groupIndex, itemIndex, itemWidth, effectiveIndex);
@@ -429,7 +430,7 @@ SettingMainForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                }
 
                pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL, ITEM_BACKGROUND_COLOR);
-               pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED, ITEM_BACKGROUND_COLOR);
+               pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED, ITEM_BACKGROUND_COLOR_HIGHLIGHTED);
 
                if (__pList != null)
                {
@@ -452,7 +453,7 @@ SettingMainForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                }
 
                pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL, ITEM_BACKGROUND_COLOR);
-               pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED, ITEM_BACKGROUND_COLOR);
+               pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED, ITEM_BACKGROUND_COLOR_HIGHLIGHTED);
 
                pItem->SetMainText(settingInfo[effectiveIndex].titleText);
                pItem->SetSubText(settingInfo[effectiveIndex].subText);
@@ -498,7 +499,7 @@ SettingMainForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                }
 
                pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL, ITEM_RADIO_ITEM_BACKGROUND_COLOR);
-               pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED, ITEM_RADIO_ITEM_BACKGROUND_COLOR);
+               pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED, ITEM_BACKGROUND_COLOR_HIGHLIGHTED);
 
                pItem->SetText(settingInfo[effectiveIndex].titleText);
                AppLogDebug("effectiveIndex %d SettingInfo[effectiveIndex].isSelected %d", effectiveIndex, settingInfo[effectiveIndex].isSelected);