From 5772a7dc70c98df90141c1cfb0a2d77c86731500 Mon Sep 17 00:00:00 2001 From: "sriram.k" Date: Fri, 19 Apr 2013 17:15:19 +0530 Subject: [PATCH] Fix for N_SE-35282. Signed-off-by: sriram.k Change-Id: I4576c2817f0b5c312219eef7ba529d3b5f62b0da --- src/ui/controls/FUiCtrl_TokenEditPresenter.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp index a811f10..4bc4514 100644 --- a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp +++ b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp @@ -1379,6 +1379,7 @@ _TokenEditPresenter::SetInitialBounds(void) float tokenTextLeftMargin = 0.0f; float tokenTextRightMargin = 0.0f; float textBoundsAlignValue = 0.0f; + float descriptionTextRightMargin = 0.0f; _ControlOrientation orientation = GetEditView()->GetOrientation(); GET_SHAPE_CONFIG(TOKENEDIT::TOP_MARGIN, orientation, tokenTopMargin); @@ -1388,6 +1389,7 @@ _TokenEditPresenter::SetInitialBounds(void) GET_SHAPE_CONFIG(TOKENEDIT::TOKEN_HORIZONTAL_SPACING, orientation, tokenHorizontalSpacing); GET_SHAPE_CONFIG(TOKENEDIT::TOKEN_TEXT_LEFT_MARGIN, orientation, tokenTextLeftMargin); GET_SHAPE_CONFIG(TOKENEDIT::TOKEN_TEXT_RIGHT_MARGIN, orientation, tokenTextRightMargin); + GET_SHAPE_CONFIG(TOKENEDIT::DESCRIPTION_TEXT_RIGHT_MARGIN, orientation, descriptionTextRightMargin); float textObjectMaxHeight = GetMaxTextHeight(); textBoundsAlignValue = (tokenHeight - textObjectMaxHeight) / 2.0f; @@ -1405,8 +1407,8 @@ _TokenEditPresenter::SetInitialBounds(void) { FloatRectangle descriptionTextRect = GetDescriptionTextRect(); - tokenTextRect.x = descriptionTextRect.x + descriptionTextRect.width + tokenVerticalSpacing; - tokenTextRect.width -= (tokenTextLeftMargin + tokenTextRightMargin + descriptionTextRect.width + 2 * __pTokenEdit->GetHorizontalMarginF(EDIT_TEXT_RIGHT_MARGIN)); + tokenTextRect.x = descriptionTextRect.x + descriptionTextRect.width + descriptionTextRightMargin; + tokenTextRect.width -= (tokenTextLeftMargin + tokenTextRightMargin + descriptionTextRect.width + descriptionTextRightMargin + 2.0f * __pTokenEdit->GetHorizontalMarginF(EDIT_TEXT_RIGHT_MARGIN)); } else { -- 2.7.4