fix for N_SE-49574 nad N_SE-49563

Signed-off-by: vipul <vipul.kumar@samsung.com>
Change-Id: Ia1fe6cc9fc3d2fdcde010faefc1f6374d3aaef16

diff --git a/src/ui/controls/FUiCtrl_TabBarImpl.cpp b/src/ui/controls/FUiCtrl_TabBarImpl.cpp
index f9b70d4..43591fc 100644 (file)
--- a/src/ui/controls/FUiCtrl_TabBarImpl.cpp
+++ b/src/ui/controls/FUiCtrl_TabBarImpl.cpp
@@ -101,7 +101,7 @@ result
 _TabBarImpl::AddItem(const Tizen::Base::String& text, int actionId)
 {
        int itemMaxCnt = 0;
-       GET_SHAPE_CONFIG(TABBAR::ITEM_COUNT_MAX, GetCore().GetOrientation(), itemMaxCnt);
+       GET_FIXED_VALUE_CONFIG(TABBAR::ITEM_COUNT_MAX, GetCore().GetOrientation(), itemMaxCnt);
        SysTryReturn(NID_UI_CTRL, GetCore().GetItemCount() < itemMaxCnt, E_MAX_EXCEEDED, E_MAX_EXCEEDED, "[E_MAX_EXCEEDED] The item is not added more than %d.", itemMaxCnt);
 
        return GetCore().AddItem(text, actionId);
@@ -111,7 +111,7 @@ result
 _TabBarImpl::InsertItemAt(int index, const Tizen::Base::String& text, int actionId)
 {
        int itemMaxCnt = 0;
-       GET_SHAPE_CONFIG(TABBAR::ITEM_COUNT_MAX, GetCore().GetOrientation(), itemMaxCnt);
+       GET_FIXED_VALUE_CONFIG(TABBAR::ITEM_COUNT_MAX, GetCore().GetOrientation(), itemMaxCnt);
        SysTryReturn(NID_UI_CTRL, GetCore().GetItemCount() < itemMaxCnt, E_MAX_EXCEEDED, E_MAX_EXCEEDED, "[E_MAX_EXCEEDED] The item is not added more than %d.", itemMaxCnt);
        SysTryReturn(NID_UI_CTRL, index >= 0 && index <= GetCore().GetItemCount(), E_OUT_OF_RANGE, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] This index(%d) is invalid.", index);
 

diff --git a/src/ui/inc/FUi_ResourceTabBarConfig.h b/src/ui/inc/FUi_ResourceTabBarConfig.h
index 734c9b9..6bd121b 100644 (file)
--- a/src/ui/inc/FUi_ResourceTabBarConfig.h
+++ b/src/ui/inc/FUi_ResourceTabBarConfig.h
@@ -51,8 +51,9 @@ DECLARE_UI_CONFIG(TABBAR);
        DECLARE_SHAPE_CONFIG(ITEM_MAX_WIDTH, 7);
        DECLARE_SHAPE_CONFIG(ITEM_HEIGHT, 8);
        DECLARE_SHAPE_CONFIG(HEIGHT, 9);
-       DECLARE_SHAPE_CONFIG(ITEM_COUNT_MAX, 10);
+//     DECLARE_SHAPE_CONFIG(ITEM_COUNT_MAX, 10);
        DECLARE_SHAPE_CONFIG(ARROW_MARGIN, 11);
+       DECLARE_FIXED_VALUE_CONFIG(ITEM_COUNT_MAX, 1);
 DECLARE_END_UI_CONFIG(TABBAR);
 
 #endif //_FUI_RESOURCE_TAB_BAR_CONFIG_H_

diff --git a/src/ui/resource/FUi_ResourceTabBarConfig.cpp b/src/ui/resource/FUi_ResourceTabBarConfig.cpp
index dbc8cab..d7f1c0e 100644 (file)
--- a/src/ui/resource/FUi_ResourceTabBarConfig.cpp
+++ b/src/ui/resource/FUi_ResourceTabBarConfig.cpp
@@ -56,8 +56,10 @@ START_UI_CONFIG(TABBAR);
                ADD_SHAPE_CONFIG(ITEM_MAX_WIDTH, 444);
                ADD_SHAPE_CONFIG(ITEM_HEIGHT, 72);
                ADD_SHAPE_CONFIG(HEIGHT, 90);
-               ADD_SHAPE_CONFIG(ITEM_COUNT_MAX, 100);
+//             ADD_SHAPE_CONFIG(ITEM_COUNT_MAX, 100);
                ADD_SHAPE_CONFIG(ARROW_MARGIN, 8);
+
+               ADD_FIXED_VALUE_CONFIG(ITEM_COUNT_MAX, 100);
        END_UI_CONFIG_MODE(720x1280);
 }
 END_UI_CONFIG(TABBAR);