Fixed JIRA issues N_SE-52484 & N_SE-52495 in Header /Footer.

Signed-off-by: moinuddin.s <moinuddin.s@samsung.com>
Change-Id: If9744533f3c5f92f2a8ac6e1e803414643e51c8a
Signed-off-by: moinuddin.s <moinuddin.s@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp
index bc6e2a0..0eb25ae 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -62,15 +62,15 @@ public:
                FloatRectangle rect = element.GetAbsoluteBounds();
                Dimension screen = _ResourceManager::GetInstance()->GetLogicalScreenSizen();
                int screenW = _ControlManager::GetInstance()->GetOrientation() == _CONTROL_ORIENTATION_PORTRAIT ? screen.width : screen.height;
-               if(rect.x < 0.0f)
+               if (rect.x < 0.0f)
                {
                        __pToolbar->GetPresenter()->AdjustItemPositionX(-(rect.x));
                        __pToolbar->Invalidate(true);
                }
-               else if(rect.x + rect.width > screenW)
+               else if (rect.x + rect.width > screenW)
                {
                        float adjustX = 0.0f;
-                       if(rect.x + rect.width > screenW)
+                       if (rect.x + rect.width > screenW)
                        {
                                adjustX = -(rect.x + rect.width - screenW);
                        }
@@ -170,7 +170,7 @@ _Toolbar::_Toolbar(void)
 
        pContainer = GetAccessibilityContainer();
 
-       if(pContainer)
+       if (pContainer)
        {
                pContainer->Activate(true);
        }
@@ -285,7 +285,7 @@ _Toolbar::~_Toolbar(void)
                __pTitleTextElement = null;
        }
 
-       if(__pAccessibilityListener)
+       if (__pAccessibilityListener)
        {
                delete __pAccessibilityListener;
                __pAccessibilityListener = null;
@@ -891,7 +891,7 @@ _Toolbar::GetBackgroundBitmap(void) const
 
        if (!pToolbar->__pToolbarBackgroundBitmap)
        {
-               if(__header == true)
+               if (__header == true)
                {
                        r = GET_BITMAP_CONFIG_N(HEADER::BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pToolbar->__pToolbarBackgroundBitmap);
                        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r));
@@ -915,7 +915,7 @@ _Toolbar::GetBackgroundEffectBitmap(void) const
 
        if (!pToolbar->__pToolbarBackgroundEffectBitmap)
        {
-               if(__header == true)
+               if (__header == true)
                {
                        bool customTheme = IS_CUSTOM_BITMAP(HEADER::BG_NORMAL);
                        if (customTheme == false)
@@ -1044,7 +1044,7 @@ _Toolbar::GetFirstEnabledItemIndex(void) const
 
        for (int i = 0; i < __itemCount; i++)
        {
-               if(__pItems.at(i)->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+               if (__pItems.at(i)->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                {
                        firstEnabledItemIndex = i;
                        break;
@@ -2491,7 +2491,10 @@ _Toolbar::SetItemSelected(int itemIndex, bool fire, bool adjust)
                        PLAY_FEEDBACK(_RESOURCE_FEEDBACK_PATTERN_TAP, __pItems.at(itemIndex));
                }
 
-               __pItems.at(itemIndex)->SetButtonStatus(_BUTTON_STATUS_SELECTED, fire);
+               if (currentSelectedItemIndex != __highlightedItemIndex)
+               {
+                       __pItems.at(itemIndex)->SetButtonStatus(_BUTTON_STATUS_SELECTED, fire);
+               }
 
                for (int i = 0; i < __itemCount; i++)
                {
@@ -2719,14 +2722,14 @@ _Toolbar::SetStyle(ToolbarStyle style)
 
        if (__style == TOOLBAR_TITLE || __style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE)
        {
-               if(__pTitleTextElement)
+               if (__pTitleTextElement)
                {
                        __pTitleTextElement->SetLabel(L"");
                }
        }
        else
        {
-               if(__pTitleTextElement)
+               if (__pTitleTextElement)
                {
                        GetAccessibilityContainer()->RemoveElement(*__pTitleTextElement);
                        __pTitleTextElement = null;
@@ -2886,20 +2889,8 @@ _Toolbar::SetTitleText(const String& text, HorizontalAlignment alignment)
                GetAccessibilityContainer()->AddElement(*__pTitleTextElement);
        }
 
-       if(__descriptionText.IsEmpty())
-       {
-               __pTitleTextElement->SetLabel(__titleText);
-               __pTitleTextElement->SetBounds(FloatRectangle(__pToolbarPresenter->GetTitleTextBoundsF()));
-       }
-       else
-       {
-               __pTitleTextElement->SetLabel(__titleText + L"," + __descriptionText);
-
-               FloatRectangle descriptionBounds = __pToolbarPresenter->GetDescriptionBoundsF();
-               FloatRectangle titleBounds = __pToolbarPresenter->GetTitleTextBoundsF();
+       __pTitleTextElement->SetBounds(__titleTextArea);
 
-               __pTitleTextElement->SetBounds(FloatRectangle(titleBounds.x, titleBounds.y, titleBounds.width, titleBounds.height + descriptionBounds.height));
-       }
        __pTitleTextElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_TITLE");
        __pTitleTextElement->SetName(L"HeaderTitleText");
 
@@ -3366,7 +3357,7 @@ _Toolbar::AddAccessibilityElement(ToolbarButton position, _Button* pButton)
                pButtonElement = pButtonContainer->GetChildElement(L"ButtonText");
        }
 
-       if(pButtonElement)
+       if (pButtonElement)
        {
                pButtonElement->SetName(name);
 
@@ -3379,13 +3370,13 @@ void
 _Toolbar::AddAccessibilityElement(_Button* pButton)
 {
        _AccessibilityContainer* pContainer = GetAccessibilityContainer();
-       if(pContainer == null)
+       if (pContainer == null)
        {
                return;
        }
 
        int priorty = 0;
-       if(__header == true)
+       if (__header == true)
        {
                priorty = ACCESSIBILITY_PRIORITY_TOP;
        }
@@ -3437,11 +3428,11 @@ _Toolbar::AddAccessibilityElement(_Button* pButton)
                        pElement = pButtonContainer->GetChildElement(L"ButtonText");
                }
 
-               if(pElement)
+               if (pElement)
                {
                        pElement->SetName(name);
                        pElement->SetTrait(trait);
-                       if(style == TOOLBAR_HEADER_SEGMENTED || style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE
+                       if (style == TOOLBAR_HEADER_SEGMENTED || style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE
                                || style == TOOLBAR_SEGMENTED || style == TOOLBAR_TAB_WITH_TITLE
                                || style == TOOLBAR_TAB || __style == TOOLBAR_TAB_LARGE)
                        {
@@ -3459,19 +3450,9 @@ _Toolbar::OnBoundsChanged(void)
 {
        RearrangeItems();
 
-       if(__pTitleTextElement)
+       if (__pTitleTextElement)
        {
-               if(__descriptionText.IsEmpty())
-               {
-                       __pTitleTextElement->SetBounds(FloatRectangle(__pToolbarPresenter->GetTitleTextBoundsF()));
-               }
-               else
-               {
-                       FloatRectangle descriptionBounds = __pToolbarPresenter->GetDescriptionBoundsF();
-                       FloatRectangle titleBounds = __pToolbarPresenter->GetTitleTextBoundsF();
-
-                       __pTitleTextElement->SetBounds(FloatRectangle(titleBounds.x, titleBounds.y, titleBounds.width, titleBounds.height + descriptionBounds.height));
-               }
+               __pTitleTextElement->SetBounds(__titleTextArea);
        }
        return;
 }
@@ -3761,7 +3742,7 @@ _Toolbar::OnFocusModeStateChanged(void)
 
                int selectedItemIndex = GetSelectedItemIndex();
 
-               if(selectedItemIndex != -1 && __pItems.at(selectedItemIndex))
+               if (selectedItemIndex != -1 && __pItems.at(selectedItemIndex))
                {
                        __pItems.at(selectedItemIndex)->SetButtonStatus(_BUTTON_STATUS_SELECTED, false);
                        __pItems.at(selectedItemIndex)->Invalidate();
@@ -3830,7 +3811,7 @@ _Toolbar::OnHeaderFocusGained(const _Control& source)
                        {
                                if (__highlightedItemIndex == __itemCount)
                                {
-                                       if(__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                       if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                        {
                                                __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
                                                __lastHighlightedItemIndex = __highlightedItemIndex;
@@ -3838,7 +3819,7 @@ _Toolbar::OnHeaderFocusGained(const _Control& source)
                                        }
                                        else
                                        {
-                                               if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                               if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                {
                                                        __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
                                                        __highlightedItemIndex++;
@@ -3851,7 +3832,7 @@ _Toolbar::OnHeaderFocusGained(const _Control& source)
                                {
                                        if (__pButtonItems[RIGHT_BUTTON])
                                        {
-                                               if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                               if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                {
                                                        __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
                                                        __lastHighlightedItemIndex = __highlightedItemIndex;
@@ -3864,7 +3845,7 @@ _Toolbar::OnHeaderFocusGained(const _Control& source)
                        {
                                if (__highlightedItemIndex == __itemCount)
                                {
-                                       if(__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                       if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                        {
                                                __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
                                                __lastHighlightedItemIndex = __highlightedItemIndex;
@@ -3879,7 +3860,7 @@ _Toolbar::OnHeaderFocusGained(const _Control& source)
                        {
                                if (__highlightedItemIndex == __itemCount)
                                {
-                                       if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                       if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                        {
                                                __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
                                                __lastHighlightedItemIndex = __highlightedItemIndex;
@@ -3912,7 +3893,7 @@ _Toolbar::OnHeaderFocusGained(const _Control& source)
                                {
                                        if (__pButtonItems[LEFT_BUTTON])
                                        {
-                                               if(__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                               if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                {
                                                        __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
 
@@ -3924,7 +3905,7 @@ _Toolbar::OnHeaderFocusGained(const _Control& source)
                                                {
                                                        if (__pButtonItems[RIGHT_BUTTON])
                                                        {
-                                                               if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                                               if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                                {
                                                                        __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
 
@@ -3937,7 +3918,7 @@ _Toolbar::OnHeaderFocusGained(const _Control& source)
                                        }
                                        else if (__pButtonItems[RIGHT_BUTTON])
                                        {
-                                               if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                               if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                {
                                                        __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
 
@@ -3961,7 +3942,7 @@ _Toolbar::OnFooterFocusGained(const _Control& source)
        {
                if (__pButtonItems[LEFT_BUTTON])
                {
-                       if(__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                       if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                        {
                                __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
 
@@ -3973,7 +3954,7 @@ _Toolbar::OnFooterFocusGained(const _Control& source)
                        {
                                if (__pButtonItems[RIGHT_BUTTON])
                                {
-                                       if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                       if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                        {
                                                __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
 
@@ -3986,7 +3967,7 @@ _Toolbar::OnFooterFocusGained(const _Control& source)
                }
                else if (__pButtonItems[RIGHT_BUTTON])
                {
-                       if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                       if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                        {
                                __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
 
@@ -4018,7 +3999,7 @@ _Toolbar::OnFooterFocusGained(const _Control& source)
                {
                        if (__pButtonItems[LEFT_BUTTON])
                        {
-                               if(__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                               if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                {
                                        __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
 
@@ -4056,7 +4037,7 @@ _Toolbar::OnFooterFocusGained(const _Control& source)
                                                        {
                                                                if (__pButtonItems[RIGHT_BUTTON])
                                                                {
-                                                                       if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                                                       if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                                        {
                                                                                __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
 
@@ -4100,7 +4081,7 @@ _Toolbar::OnFooterFocusGained(const _Control& source)
                                                {
                                                        if (__pButtonItems[RIGHT_BUTTON])
                                                        {
-                                                               if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                                               if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                                {
                                                                        __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
 
@@ -4229,7 +4210,7 @@ _Toolbar::OnFocusLost(const _Control& source)
 
                int selectedItemIndex = GetSelectedItemIndex();
 
-               if(selectedItemIndex != -1 && __pItems.at(selectedItemIndex))
+               if (selectedItemIndex != -1 && __pItems.at(selectedItemIndex))
                {
                        if (__pItems.at(selectedItemIndex)->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                        {
@@ -5961,20 +5942,6 @@ _Toolbar::OnDraw(void)
 
        __pToolbarPresenter->Draw();
 
-       if(__pTitleTextElement)
-       {
-               if(__descriptionText.IsEmpty())
-               {
-                       __pTitleTextElement->SetBounds(FloatRectangle(__pToolbarPresenter->GetTitleTextBoundsF()));
-               }
-               else
-               {
-                       FloatRectangle descriptionBounds = __pToolbarPresenter->GetDescriptionBoundsF();
-                       FloatRectangle titleBounds = __pToolbarPresenter->GetTitleTextBoundsF();
-
-                       __pTitleTextElement->SetBounds(FloatRectangle(titleBounds.x, titleBounds.y, titleBounds.width, titleBounds.height + descriptionBounds.height));
-               }
-       }
        return;
 }
 
@@ -8868,7 +8835,7 @@ _Toolbar::RearrangeButtonItems(void)
 
                RealignItem(__pItems.at(0), textExtentSize_0);
        }
-       else if(__itemCount == 2)
+       else if (__itemCount == 2)
        {
                float textExtentSize_0 = __pItems.at(0)->GetTextExtentSizeF();
                float textExtentSize_1 = __pItems.at(1)->GetTextExtentSizeF();
@@ -9278,7 +9245,7 @@ _Toolbar::SetPropertyDescriptionText(const Variant& text)
 
        r = __pToolbarPresenter->SetDescriptionText(__descriptionText);
 
-       if(__pTitleTextElement)
+       if (__pTitleTextElement)
        {
                if (text.IsEmpty())
                {
@@ -9318,7 +9285,7 @@ _Toolbar::SetPropertyTitleText(const Variant& text)
 {
        __titleText = text.ToString();
 
-       if(__pTitleTextElement)
+       if (__pTitleTextElement)
        {
                __pTitleTextElement->SetLabel(__titleText);
        }

diff --git a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
index 9b5b704..b558ad0 100644 (file)
--- a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
@@ -236,7 +236,7 @@ _ToolbarPresenter::Draw(void)
 
                        DrawDescriptionText();
 
-                       if(!__titleText.IsEmpty())
+                       if (!__titleText.IsEmpty())
                        {
                                __fontSize = fontSize;
 
@@ -264,7 +264,7 @@ _ToolbarPresenter::Draw(void)
                {
                        int firstEnabledItemIndex = __pToolbar->GetFirstEnabledItemIndex();
 
-                       if(firstEnabledItemIndex != -1)
+                       if (firstEnabledItemIndex != -1)
                        {
                                __pToolbar->SetItemSelected(firstEnabledItemIndex, true, false);
                        }
@@ -311,7 +311,7 @@ _ToolbarPresenter::DrawDivider(void)
        {
                GET_SHAPE_CONFIG(HEADER::TAB_LARGE_DIVIDER_HEIGHT, __pToolbar->GetOrientation(), dividerHeight);
        }
-       else if(__pToolbar->IsHeader()) //All header styles
+       else if (__pToolbar->IsHeader()) //All header styles
        {
                GET_SHAPE_CONFIG(HEADER::DIVIDER_HEIGHT, __pToolbar->GetOrientation(), dividerHeight);
        }
@@ -688,7 +688,7 @@ _ToolbarPresenter::DrawDescriptionText(void)
 
        __descriptionRect.y = __titleRect.y + __titleRect.height;
 
-       if(__titleText.IsEmpty())
+       if (__titleText.IsEmpty())
        {
                __descriptionRect.width = __toolbarUsableArea.width;
        }
@@ -753,7 +753,7 @@ _ToolbarPresenter::DrawDividerLine(const FloatPoint& point, Canvas* pCanvas)
        {
                GET_SHAPE_CONFIG(HEADER::TAB_LARGE_DIVIDER_HEIGHT, __pToolbar->GetOrientation(), dividerHeight);
        }
-       else if(__pToolbar->IsHeader()) //All header styles
+       else if (__pToolbar->IsHeader()) //All header styles
        {
                GET_SHAPE_CONFIG(HEADER::DIVIDER_HEIGHT, __pToolbar->GetOrientation(), dividerHeight);
        }
@@ -961,11 +961,11 @@ _ToolbarPresenter::DrawItems(void)
                                __titleRect.x = leftMargin + pTitleIcon->GetWidthF() + iconRightMargin;
                                __titleRect.y = headerTopMargin + (titleDisplayHeight - titleHeight) / 2;
 
-                               if(__pTitleTextObject->GetAlignment() & TEXT_OBJECT_ALIGNMENT_CENTER)
+                               if (__pTitleTextObject->GetAlignment() & TEXT_OBJECT_ALIGNMENT_CENTER)
                                {
                                        leftMargin = (__titleRect.width - titleTextDimension.width) / 2;
                                }
-                               else if(__pTitleTextObject->GetAlignment() & TEXT_OBJECT_ALIGNMENT_RIGHT)
+                               else if (__pTitleTextObject->GetAlignment() & TEXT_OBJECT_ALIGNMENT_RIGHT)
                                {
                                        leftMargin = __titleRect.width - titleTextDimension.width - iconRightMargin * 2;
                                }
@@ -1012,11 +1012,11 @@ _ToolbarPresenter::DrawItems(void)
                {
                        pTitleIcon->Scale(FloatDimension(iconWidth, iconWidth));
 
-                       if(__pToolbar->GetTitleTextHorizontalAlignment() == ALIGNMENT_CENTER)
+                       if (__pToolbar->GetTitleTextHorizontalAlignment() == ALIGNMENT_CENTER)
                        {
                                leftMargin = (leftMargin + usableArea.width - (pTitleIcon->GetWidthF() + processingAnimationIconGap + processingAnimationIconSize)) / 2;
                        }
-                       else if(__pToolbar->GetTitleTextHorizontalAlignment() == ALIGNMENT_RIGHT)
+                       else if (__pToolbar->GetTitleTextHorizontalAlignment() == ALIGNMENT_RIGHT)
                        {
                                leftMargin = leftMargin + usableArea.width - (pTitleIcon->GetWidthF() + processingAnimationIconGap + processingAnimationIconSize);
                        }
@@ -1036,11 +1036,11 @@ _ToolbarPresenter::DrawItems(void)
                {
                        pTitleIcon->Scale(FloatDimension(iconWidth, iconWidth));
 
-                       if(__pToolbar->GetTitleTextHorizontalAlignment() == ALIGNMENT_CENTER)
+                       if (__pToolbar->GetTitleTextHorizontalAlignment() == ALIGNMENT_CENTER)
                        {
                                leftMargin = usableArea.width / 2;
                        }
-                       else if(__pToolbar->GetTitleTextHorizontalAlignment() == ALIGNMENT_RIGHT)
+                       else if (__pToolbar->GetTitleTextHorizontalAlignment() == ALIGNMENT_RIGHT)
                        {
                                leftMargin = usableArea.width - pTitleIcon->GetWidthF();
                        }
@@ -1049,11 +1049,11 @@ _ToolbarPresenter::DrawItems(void)
                }
                else
                {
-                       if(__pToolbar->GetTitleTextHorizontalAlignment() == ALIGNMENT_CENTER)
+                       if (__pToolbar->GetTitleTextHorizontalAlignment() == ALIGNMENT_CENTER)
                        {
                                leftMargin = (usableArea.width - (processingAnimationIconGap + processingAnimationIconSize))/ 2;
                        }
-                       else if(__pToolbar->GetTitleTextHorizontalAlignment() == ALIGNMENT_RIGHT)
+                       else if (__pToolbar->GetTitleTextHorizontalAlignment() == ALIGNMENT_RIGHT)
                        {
                                leftMargin = usableArea.width - (processingAnimationIconGap + processingAnimationIconSize);
                        }