fix for jira 51540

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

diff --git a/src/ui/controls/FUiCtrl_OptionMenu.cpp b/src/ui/controls/FUiCtrl_OptionMenu.cpp
index ce0f4ef..2061395 100644 (file)
--- a/src/ui/controls/FUiCtrl_OptionMenu.cpp
+++ b/src/ui/controls/FUiCtrl_OptionMenu.cpp
@@ -485,8 +485,9 @@ _OptionMenu::OnAttachedToMainTree(void)
                }
        }
 
-       r = __pOptionMenuPresenter->CalculateWindowRect();
+       __pOptionMenuPresenter->CalculateItemMaximumWidth();
 
+       r = __pOptionMenuPresenter->CalculateWindowRect();
        SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 
        GetEcoreEvasMgr()->GetEcoreEvas()->SetWindowBounds(*this, GetBoundsF());

diff --git a/src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp b/src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp
index 6ba4531..7a3ecbc 100755 (executable)
--- a/src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp
@@ -443,9 +443,9 @@ _OptionMenuPresenter::CalculateItemMaximumWidth(void)
 {
        FloatDimension itemSize(0.0f, 0.0f);
        FloatDimension textArea(0.0f, 0.0f);
-       float maxItemWidth = 0.0f;
+       float maxItemWidth = __itemMinWidth;
 
-       for (int i = 0; i < __pModel->GetItemCount() - 1; i++)
+       for (int i = 0; i < __pModel->GetItemCount(); i++)
        {
                _OptionMenuItem* pItem = null;