fix jira (title icon align , fittocontent)

Change-Id: If25cda0f27eeb3bc84dfded72081ebd8100d3088

diff --git a/src/ui/controls/FUiCtrl_Button.cpp b/src/ui/controls/FUiCtrl_Button.cpp
index ce38af0..8788d9a 100644 (file)
--- a/src/ui/controls/FUiCtrl_Button.cpp
+++ b/src/ui/controls/FUiCtrl_Button.cpp
@@ -1550,7 +1550,17 @@ _Button::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
                pTextObject->SetFont(pFont, 0, pTextObject->GetTextLength());
                pTextObject->Compose();
 
-               textSize = pTextObject->GetTextExtentF();
+               int displayLineCount = pTextObject->GetDisplayLineCount();
+               int offSet = pTextObject->GetFirstTextIndexAt(displayLineCount - 1);
+
+               if (displayLineCount == 1)
+               {
+                       textSize = pTextObject->GetTextExtentF(offSet, pTextObject->GetTextLength() - offSet);
+               }
+               else
+               {
+                       textSize = pTextObject->GetTextExtentF();
+               }
 
                dimension.width = (textSize.width < bounds.width) ? textSize.width : bounds.width;
        }
@@ -1571,8 +1581,8 @@ _Button::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
        pTextObject->SetBounds(previousRect);
        pTextObject->SetAction(previousActionType);
 
-       dimension.width += __leftMargin * 4;
-       dimension.height += __topMargin * 4;
+       dimension.width += __leftMargin * 2;
+       dimension.height += __topMargin * 2;
 
        for (int i = 0; i < NUMBER_OF_BUTTON_STATUS; i++)
        {

diff --git a/src/ui/controls/FUiCtrl_Label.cpp b/src/ui/controls/FUiCtrl_Label.cpp
index 52c0adf..53064d8 100644 (file)
--- a/src/ui/controls/FUiCtrl_Label.cpp
+++ b/src/ui/controls/FUiCtrl_Label.cpp
@@ -610,7 +610,17 @@ _Label::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
                pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_NONE);
                pTextObject->Compose();
 
-               textSize = pTextObject->GetTextExtentF();
+               int displayLineCount = pTextObject->GetDisplayLineCount();
+               int offSet = pTextObject->GetFirstTextIndexAt(displayLineCount - 1);
+
+               if (displayLineCount == 1)
+               {
+                       textSize = pTextObject->GetTextExtentF(offSet, pTextObject->GetTextLength() - offSet);
+               }
+               else
+               {
+                       textSize = pTextObject->GetTextExtentF();
+               }
 
                dimension.width = (textSize.width < bounds.width) ? textSize.width : bounds.width;
        }

diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp
index 82afc0d..0fb9422 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -3650,6 +3650,7 @@ _Toolbar::OnFocusModeStateChanged(void)
                                        if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                        {
                                                __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                               __pButtonItems[LEFT_BUTTON]->Invalidate();
                                        }
                                }
                                else if (__highlightedItemIndex == __itemCount + 1)
@@ -3657,6 +3658,7 @@ _Toolbar::OnFocusModeStateChanged(void)
                                        if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                        {
                                                __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                               __pButtonItems[RIGHT_BUTTON]->Invalidate();
                                        }
                                }
                        }
@@ -3667,6 +3669,7 @@ _Toolbar::OnFocusModeStateChanged(void)
                                        if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                        {
                                                __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                               __pButtonItems[LEFT_BUTTON]->Invalidate();
                                        }
                                }
                        }
@@ -3680,6 +3683,7 @@ _Toolbar::OnFocusModeStateChanged(void)
                                        if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                        {
                                                __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                               __pButtonItems[RIGHT_BUTTON]->Invalidate();
                                        }
                                }
                        }
@@ -3694,6 +3698,7 @@ _Toolbar::OnFocusModeStateChanged(void)
                                if (__pItems.at(__highlightedItemIndex)->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                {
                                        __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                       __pItems.at(__highlightedItemIndex)->Invalidate();
                                }
                        }
                }
@@ -3708,6 +3713,7 @@ _Toolbar::OnFocusModeStateChanged(void)
                                                if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                {
                                                        __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                                       __pButtonItems[LEFT_BUTTON]->Invalidate();
                                                }
                                        }
                                        else if (__highlightedItemIndex == __itemCount + 1)
@@ -3715,6 +3721,7 @@ _Toolbar::OnFocusModeStateChanged(void)
                                                if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                {
                                                        __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                                       __pButtonItems[RIGHT_BUTTON]->Invalidate();
                                                }
                                        }
                                }
@@ -3725,6 +3732,7 @@ _Toolbar::OnFocusModeStateChanged(void)
                                                if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                {
                                                        __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                                       __pButtonItems[LEFT_BUTTON]->Invalidate();
                                                }
                                        }
                                }
@@ -3738,6 +3746,7 @@ _Toolbar::OnFocusModeStateChanged(void)
                                                if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                {
                                                        __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                                       __pButtonItems[RIGHT_BUTTON]->Invalidate();
                                                }
                                        }
                                }
@@ -3749,10 +3758,11 @@ _Toolbar::OnFocusModeStateChanged(void)
                if(selectedItemIndex != -1 && __pItems.at(selectedItemIndex))
                {
                        __pItems.at(selectedItemIndex)->SetButtonStatus(_BUTTON_STATUS_SELECTED, false);
+                       __pItems.at(selectedItemIndex)->Invalidate();
                }
        }
 
-       Invalidate(true);
+       //Invalidate(true);//fix title slide restart
 
        return;
 } // OnFocusModeStateChanged

diff --git a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
index e7b3a47..4d82878 100644 (file)
--- a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
@@ -889,7 +889,7 @@ _ToolbarPresenter::DrawItems(void)
 
                if (pTitleIcon)
                {
-                       totalWidth += (pTitleIcon->GetWidthF() + usableArea.x);
+                       totalWidth += (pTitleIcon->GetWidthF() + iconRightMargin);
                }
 
 
@@ -955,11 +955,11 @@ _ToolbarPresenter::DrawItems(void)
 
                                if(__pTitleTextObject->GetAlignment() & TEXT_OBJECT_ALIGNMENT_CENTER)
                                {
-                                       leftMargin = (__titleRect.width - titleTextDimension.width) / 2 - leftMargin;
+                                       leftMargin = (__titleRect.width - titleTextDimension.width) / 2;
                                }
                                else if(__pTitleTextObject->GetAlignment() & TEXT_OBJECT_ALIGNMENT_RIGHT)
                                {
-                                       leftMargin = __titleRect.width - titleTextDimension.width - leftMargin * 3;
+                                       leftMargin = __titleRect.width - titleTextDimension.width - iconRightMargin * 2;
                                }
 
                                pCanvas->DrawBitmap(FloatPoint(leftMargin, headerTopMargin + (titleDisplayHeight - pTitleIcon->GetHeightF()) / 2), *(pTitleIcon));
@@ -977,7 +977,7 @@ _ToolbarPresenter::DrawItems(void)
                                                        titleBadgeIconTopMargin));
                                }
 
-                               __titleRect.width -= (pTitleIcon->GetWidthF() + usableArea.x);
+                               __titleRect.width -= (pTitleIcon->GetWidthF() + iconRightMargin);
                        }
                        else
                        {