add patch

[framework/osp/uifw.git] / src / ui / controls / FUiCtrl_HeaderImpl.cpp

diff --git a/src/ui/controls/FUiCtrl_HeaderImpl.cpp b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
index dfa1a10..f8159b9 100644 (file)
--- a/src/ui/controls/FUiCtrl_HeaderImpl.cpp
+++ b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
@@ -515,7 +515,7 @@ _HeaderImpl::SetBackgroundBitmap(const Bitmap* pBitmap)
 result
 _HeaderImpl::SetButton(ButtonPosition position, const ButtonItem& button)
 {
-       SysTryReturnResult(NID_UI_CTRL, (!(__style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_TAB_LARGE)), E_INVALID_OPERATION,
+       SysTryReturnResult(NID_UI_CTRL, (!(__style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_LARGE)), E_INVALID_OPERATION,
                        "[E_INVALID_OPERATION] This operation is not supported.");
 
        SysTryReturnResult(NID_UI_CTRL, (button.GetActionId() >= HEADER_ACTION_ID_MIN && button.GetActionId() <= HEADER_ACTION_ID_MAX),
@@ -523,8 +523,11 @@ _HeaderImpl::SetButton(ButtonPosition position, const ButtonItem& button)
 
        int count = GetItemCount();
 
-       SysTryReturnResult(NID_UI_CTRL, (count <= HEADER_MAX_ITEM_COUNT_WITH_BUTTON), E_SYSTEM,
-                          "[E_SYSTEM] If the item count is larger then 4, no button can be set.");
+       if (HEADER_STYLE_TAB_WITH_TITLE != __style)
+       {
+               SysTryReturnResult(NID_UI_CTRL, (count <= HEADER_MAX_ITEM_COUNT_WITH_BUTTON), E_SYSTEM,
+                               "[E_SYSTEM] If the item count is larger then 4, no button can be set.");
+       }
 
        SysTryReturnResult(NID_UI_CTRL, (position == BUTTON_POSITION_LEFT || position == BUTTON_POSITION_RIGHT), E_INVALID_ARG,
                           "[E_INVALID_ARG] The position is invalid.");
@@ -1013,7 +1016,7 @@ _HeaderImpl::CheckItemValidate(const HeaderItem& item)
                goto CATCH;
        }
 
-       if ((count >= HEADER_MAX_ITEM_COUNT_WITH_BUTTON) &&
+       if ((HEADER_STYLE_TAB_WITH_TITLE != __style) && (count >= HEADER_MAX_ITEM_COUNT_WITH_BUTTON) &&
                (true == IsButtonSet(BUTTON_POSITION_LEFT) || true == IsButtonSet(BUTTON_POSITION_RIGHT)))
        {
                SysLogException(NID_UI_CTRL, E_MAX_EXCEEDED, "[E_MAX_EXCEEDED] The number of items with button have exceeded the maximum limit.");