Fix for internal issues in toolbar

Signed-off-by: vignesh.v <vignesh.v@samsung.com>
Change-Id: I39c53dcee3fc77ee93dbadea228aa111d8d5883a

diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp
index bc23179..0009a1b 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -2732,20 +2732,10 @@ _Toolbar::SetStyle(ToolbarStyle style)
        __lastHighlightedItemIndex = -1;
        __highlighted = false;
 
-       if (__style == TOOLBAR_TITLE || __style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE)
-       {
-               if (__pTitleTextElement)
-               {
-                       __pTitleTextElement->SetLabel(L"");
-               }
-       }
-       else
+       if (__pTitleTextElement)
        {
-               if (__pTitleTextElement)
-               {
-                       GetAccessibilityContainer()->RemoveElement(*__pTitleTextElement);
-                       __pTitleTextElement = null;
-               }
+               GetAccessibilityContainer()->RemoveElement(*__pTitleTextElement);
+               __pTitleTextElement = null;
        }
 
        if (__itemCount == 0 && __pButtonItems[LEFT_BUTTON] == null && __pButtonItems[RIGHT_BUTTON] == null)
@@ -7880,11 +7870,13 @@ _Toolbar::RearrangeItems(void)
                {
                        GET_SHAPE_CONFIG(HEADER::TITLE_HEIGHT_WITH_SEGMENTED_ITEM, GetOrientation(), vmargin);
                        GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_HEIGHT, GetOrientation(), headerButtonItemHeight);
+                       __titleTextArea.height = vmargin;
                }
                else if (__style == TOOLBAR_TAB_WITH_TITLE)
                {
                        GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_TOP_MARGIN, GetOrientation(), vmargin);
                        GET_SHAPE_CONFIG(HEADER::TITLE_HEIGHT_WITH_SEGMENTED_ITEM, GetOrientation(), headerButtonItemHeight);
+                       __titleTextArea.height = headerButtonItemHeight;
                }
                else
                {