From 0bfcbd85106f56a633e81a38c9baf6510867fd8c Mon Sep 17 00:00:00 2001 From: Keuckdo Bang Date: Fri, 10 May 2013 15:08:07 +0900 Subject: [PATCH] Fixed DCM-1615 Change-Id: I1c2c85c2df7261cefbac17534e38aa8781d8e5c2 --- src/ui/controls/FUiCtrl_Label.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ui/controls/FUiCtrl_Label.cpp b/src/ui/controls/FUiCtrl_Label.cpp index 23e181e..afbdd2f 100644 --- a/src/ui/controls/FUiCtrl_Label.cpp +++ b/src/ui/controls/FUiCtrl_Label.cpp @@ -567,7 +567,15 @@ _Label::GetContentSizeInternalF(void) const pTextObject->Compose(); dimension = pTextObject->GetTextExtentF(0, pTextObject->GetTextLength()); - contentRect.width = _ControlManager::GetInstance()->GetScreenSizeF().width; + _ControlOrientation orientation = GetOrientation(); + if (orientation == _CONTROL_ORIENTATION_PORTRAIT) + { + contentRect.width = _ControlManager::GetInstance()->GetScreenSizeF().width; + } + else + { + contentRect.width = _ControlManager::GetInstance()->GetScreenSizeF().height; + } if (dimension.width > contentRect.width - GetBoundsF().x - __leftMargin * 2) { -- 2.7.4