From 3360a769a491bce544d61c42ffbb21809990d053 Mon Sep 17 00:00:00 2001 From: Syed Khaja Moinuddin Date: Wed, 8 May 2013 22:33:50 +0900 Subject: [PATCH] Fixed N_SE-37910 in EditDate / EditTime w.r.t Title Signed-off-by: Syed Khaja Moinuddin Change-Id: I202e06676c786e28c5992943e7f61f49d55a5712 Signed-off-by: Syed Khaja Moinuddin --- src/ui/controls/FUiCtrl_EditDatePresenter.cpp | 5 ++--- src/ui/controls/FUiCtrl_EditTimePresenter.cpp | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp index 1db2c16..e5dc76f 100644 --- a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp +++ b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp @@ -141,7 +141,6 @@ _EditDatePresenter::Initialize(void) { result r = E_SUCCESS; float editDateHeight = 0.0f; - float editDateWidth = 0.0f; float dateLeftMargin = 0.0f; float titleLeftMargin = 0.0f; float titledateMargin = 0.0f; @@ -151,7 +150,6 @@ _EditDatePresenter::Initialize(void) float dayElementMinWidth = 0.0f; FloatRectangle bounds(0.0f, 0.0f, 0.0f, 0.0f); - GET_SHAPE_CONFIG(EDITDATE::WIDTH, __pEditDate->GetOrientation(), editDateWidth); GET_SHAPE_CONFIG(EDITDATE::HEIGHT, __pEditDate->GetOrientation(), editDateHeight); GET_SHAPE_CONFIG(EDITDATE::TITLE_TEXT_LEFT_MARGIN, __pEditDate->GetOrientation(), titleLeftMargin); GET_SHAPE_CONFIG(EDITDATE::ITEM_DIVIDER_HEIGHT, __pEditDate->GetOrientation(), __dividerLineHeight); @@ -181,7 +179,7 @@ _EditDatePresenter::Initialize(void) { __titleBounds.x = titleLeftMargin; __titleBounds.y = (editDateHeight - (__titleBounds.height + titledateMargin + dateHeight)) / 2.0f; - __titleBounds.width = editDateWidth - __titleBounds.x; + __titleBounds.width = __pEditDate->GetBoundsF().width - __titleBounds.x; bounds.y = __titleBounds.y + __titleBounds.height + titledateMargin; @@ -258,6 +256,7 @@ _EditDatePresenter::InitializeTitleObject(void) __titleObject.SetAlignment(TEXT_OBJECT_ALIGNMENT_LEFT | TEXT_OBJECT_ALIGNMENT_MIDDLE); __titleObject.SetWrap(TEXT_OBJECT_WRAP_TYPE_NONE); __titleObject.SetAction(TEXT_OBJECT_ACTION_TYPE_ABBREV); + __titleObject.SetTextObjectEllipsisType(TEXT_OBJECT_ELLIPSIS_TYPE_TAIL); return r; } diff --git a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp index 000106e..c59ae76 100644 --- a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp +++ b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp @@ -428,10 +428,9 @@ void _EditTimePresenter::SetTitleBounds(void) { GET_SHAPE_CONFIG(EDITTIME::TITLE_TEXT_LEFT_MARGIN, __pEditTime->GetOrientation(), __titleBounds.x); - GET_SHAPE_CONFIG(EDITTIME::WIDTH, __pEditTime->GetOrientation(), __titleBounds.width); GET_SHAPE_CONFIG(EDITTIME::TITLE_HEIGHT, __pEditTime->GetOrientation(), __titleBounds.height); - __titleBounds.width = __titleBounds.width - __titleBounds.x; + __titleBounds.width = __pEditTime->GetBoundsF().width - __titleBounds.x; return; } @@ -728,6 +727,7 @@ _EditTimePresenter::InitializeTitleObject(void) __titleObject.SetAlignment(TEXT_OBJECT_ALIGNMENT_LEFT | TEXT_OBJECT_ALIGNMENT_MIDDLE); __titleObject.SetWrap(TEXT_OBJECT_WRAP_TYPE_NONE); __titleObject.SetAction(TEXT_OBJECT_ACTION_TYPE_ABBREV); + __titleObject.SetTextObjectEllipsisType(TEXT_OBJECT_ELLIPSIS_TYPE_TAIL); return r; } -- 2.7.4