Modified to set previous action mode after calculating text extent

Change-Id: I3a56fce34296ccee3e0ca65b16b88b2b47a45929

diff --git a/src/ui/controls/FUiCtrl_Button.cpp b/src/ui/controls/FUiCtrl_Button.cpp
index 790a484..ce38af0 100644 (file)
--- a/src/ui/controls/FUiCtrl_Button.cpp
+++ b/src/ui/controls/FUiCtrl_Button.cpp
@@ -1525,6 +1525,7 @@ _Button::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
        Font* pFont = __pButtonPresenter->GetFont();
 
        FloatRectangle previousRect = pTextObject->GetBoundsF();
+       TextObjectActionType previousActionType = pTextObject->GetAction();
 
        dimension.width = GetBoundsF().width - __leftMargin * 2;
        dimension.height = GetBoundsF().height - __topMargin * 2;
@@ -1568,6 +1569,7 @@ _Button::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
        }
 
        pTextObject->SetBounds(previousRect);
+       pTextObject->SetAction(previousActionType);
 
        dimension.width += __leftMargin * 4;
        dimension.height += __topMargin * 4;

diff --git a/src/ui/controls/FUiCtrl_Label.cpp b/src/ui/controls/FUiCtrl_Label.cpp
index ec2b46d..e8ba7f9 100644 (file)
--- a/src/ui/controls/FUiCtrl_Label.cpp
+++ b/src/ui/controls/FUiCtrl_Label.cpp
@@ -586,6 +586,7 @@ _Label::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
        TextObject* pTextObject = __pLabelPresenter->GetTextObject();
 
        FloatRectangle previousRect = pTextObject->GetBoundsF();
+       TextObjectActionType previousActionType = pTextObject->GetAction();
 
        dimension.width = GetBoundsF().width - __leftMargin * 2;
        dimension.height = GetBoundsF().height - __topMargin * 2;
@@ -627,6 +628,7 @@ _Label::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
        }
 
        pTextObject->SetBounds(previousRect);
+       pTextObject->SetAction(previousActionType);
 
        dimension.width += __leftMargin * 2;
        dimension.height += __topMargin * 2;