Fixed S1-13460 and changed to use member variable.

Change-Id: I42da9c5cd5d69b253f7f49a797baca6aa79e742a
Signed-off-by: clone <ingyou.park@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_ContextMenuItem.cpp b/src/ui/controls/FUiCtrl_ContextMenuItem.cpp
index b8222c0..acfcbbb 100644 (file)
--- a/src/ui/controls/FUiCtrl_ContextMenuItem.cpp
+++ b/src/ui/controls/FUiCtrl_ContextMenuItem.cpp
@@ -59,6 +59,8 @@ _ContextMenuItem::_ContextMenuItem(void)
        GET_SHAPE_CONFIG(CONTEXTMENU::LIST_LEFT_MARGIN,  _CONTROL_ORIENTATION_PORTRAIT, __leftMargin);
        GET_SHAPE_CONFIG(CONTEXTMENU::LIST_RIGHT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __rightMargin);
        GET_SHAPE_CONFIG(CONTEXTMENU::LIST_DIVIDER_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, __dividerHeight);
+
+       GET_COLOR_CONFIG(CONTEXTMENU::ITEM_BG_PRESSED, __selectedBgColor);
        GET_COLOR_CONFIG(CONTEXTMENU::LIST_ITEM_DIVIDER_01_NORMAL, __lowerDividerLineColor);    // lower divider of item n and
        GET_COLOR_CONFIG(CONTEXTMENU::LIST_ITEM_DIVIDER_02_NORMAL, __upperDividerLineColor);    // upper divider of item n+1 are bonded together.
 }
@@ -291,9 +293,7 @@ _ContextMenuItem::DrawItem(void)
 
        if(__selected)
        {
-               Color selectedBgColor;
-               GET_COLOR_CONFIG(CONTEXTMENU::ITEM_BG_PRESSED, selectedBgColor);
-               SetBackgroundColor(selectedBgColor);
+               SetBackgroundColor(__selectedBgColor);
        }
        else
        {

diff --git a/src/ui/controls/FUiCtrl_TabBarModel.cpp b/src/ui/controls/FUiCtrl_TabBarModel.cpp
index 4c2986c..78d9560 100644 (file)
--- a/src/ui/controls/FUiCtrl_TabBarModel.cpp
+++ b/src/ui/controls/FUiCtrl_TabBarModel.cpp
@@ -108,6 +108,7 @@ _TabBarModel::AddItem(const Tizen::Base::String& text, int actionId, _ControlOri
        else
        {
                pItem->SetStatus(ITEM_STATUS_SELECTED);
+               __selectedItemIndex = 0;
        }
 
        _TabBarItem* pPreviousItem = GetItemAt(itemCount - 1);