From ef6271759da80eae2c38cb7902501cbb697adabd Mon Sep 17 00:00:00 2001 From: kishorekumar Dachinamoorthy Date: Wed, 24 Jul 2013 15:23:56 +0530 Subject: [PATCH] Fixing the PLM-P130719-5874. Change-Id: Ia0cc79aaa3c428e6c4800783a3d63aee7df86ad9 Signed-off-by: kishorekumar Dachinamoorthy --- src/ui/controls/FUiCtrl_SliderPresenter.cpp | 20 +++++------ src/ui/inc/FUi_ResourceSliderConfig.h | 52 +++++++++++++--------------- src/ui/resource/FUi_ResourceSliderConfig.cpp | 6 ++-- 3 files changed, 37 insertions(+), 41 deletions(-) diff --git a/src/ui/controls/FUiCtrl_SliderPresenter.cpp b/src/ui/controls/FUiCtrl_SliderPresenter.cpp index 2d2a766..29f4d4d 100644 --- a/src/ui/controls/FUiCtrl_SliderPresenter.cpp +++ b/src/ui/controls/FUiCtrl_SliderPresenter.cpp @@ -295,15 +295,15 @@ _SliderPresenter::Resize(void) if (!__isCustomHandle) { - r = GET_SHAPE_CONFIG(SLIDER::HANDLE_OFFSET, orientation, __handleOffset); - SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - r = GET_SHAPE_CONFIG(SLIDER::HANDLE_WIDTH, orientation, __handleRect.width); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); r = GET_SHAPE_CONFIG(SLIDER::HANDLE_HEIGHT, orientation, __handleRect.height); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); + + __handleOffset = __handleRect.width / 2; } + __rect = FloatRectangle(0.0f, 0.0f, __pSlider->GetBoundsF().width, __pSlider->GetBoundsF().height); r = GET_SHAPE_CONFIG(SLIDER::ICON_RIGHT_MARGIN, orientation, iconRightMargin); @@ -314,7 +314,7 @@ _SliderPresenter::Resize(void) r = GET_SHAPE_CONFIG(SLIDER::MINIMUM_WIDTH_WITH_ICON, orientation, minimumWidth); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - r = GET_SHAPE_CONFIG(SLIDER::BAR_LEFT_MARGIN_WITH_ICON, orientation, barLeftMargin); + r = GET_SHAPE_CONFIG(SLIDER::ICON_LEFT_MARGIN, orientation, barLeftMargin); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); } else @@ -353,13 +353,13 @@ _SliderPresenter::Resize(void) { titleTextBounds = GetTitleTextBounds(); sliderY = titleTextBounds.y + titleTextBounds.height; - __touchRect = FloatRectangle(barLeftMargin - __handleOffset , sliderY + (__rect.height - (sliderY + __handleRect.height)) / 2.0f, - __rect.width - (barLeftMargin + barRightMargin) + (2.0f * __handleOffset) , __handleRect.height); + __touchRect = FloatRectangle(barLeftMargin + __barOffset - __handleOffset, sliderY + (__rect.height - (sliderY + __handleRect.height)) / 2.0f, + __rect.width - (barLeftMargin + barRightMargin) + (2.0f * __handleOffset) - ( 2.0 * __barOffset), __handleRect.height); } else { - __touchRect = FloatRectangle(barLeftMargin - __handleOffset, (__rect.height - __handleRect.height) / 2.0f, - (__rect.width - (barLeftMargin + barRightMargin)) + (2.0f * __handleOffset) , __handleRect.height); + __touchRect = FloatRectangle(barLeftMargin + __barOffset - __handleOffset, (__rect.height - __handleRect.height) / 2.0f, + (__rect.width - (barLeftMargin + barRightMargin ) - ( 2.0 * __barOffset)) + (2.0f * __handleOffset), __handleRect.height); } if (__pSlider->GetIcon(ICON_POSITION_LEFT) != null) @@ -373,8 +373,8 @@ _SliderPresenter::Resize(void) __touchRect.width = __touchRect.width - (iconWidth + iconSideMargin + iconRightMargin); } - __barBgRect = FloatRectangle(__touchRect.x + __handleOffset, __touchRect.y + - ((__handleRect.height - barHeight) / 2.0f), __touchRect.width - (2.0f * __handleOffset), barHeight); + __barBgRect = FloatRectangle(__touchRect.x + __handleOffset - __barOffset, __touchRect.y + + ((__handleRect.height - barHeight) / 2.0f), __touchRect.width - (2.0f * __handleOffset) + (2.0 * __barOffset), barHeight); FloatRectangle absBounds = __pSlider->GetAbsoluteBoundsF(); __pSliderOverlay->SetSliderRect(absBounds, __touchRect); diff --git a/src/ui/inc/FUi_ResourceSliderConfig.h b/src/ui/inc/FUi_ResourceSliderConfig.h index 4506f17..306c915 100644 --- a/src/ui/inc/FUi_ResourceSliderConfig.h +++ b/src/ui/inc/FUi_ResourceSliderConfig.h @@ -62,33 +62,31 @@ DECLARE_UI_CONFIG(SLIDER); DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_EFFECT_NORMAL, 21); DECLARE_SHAPE_CONFIG(HANDLE_WIDTH, 1); DECLARE_SHAPE_CONFIG(HANDLE_HEIGHT, 2); - DECLARE_SHAPE_CONFIG(HANDLE_OFFSET, 3); - DECLARE_SHAPE_CONFIG(HANDLE_ONE_DIGIT_TEXT_SIZE, 4); - DECLARE_SHAPE_CONFIG(HANDLE_TWO_DIGIT_TEXT_SIZE, 5); - DECLARE_SHAPE_CONFIG(HANDLE_THREE_DIGIT_TEXT_SIZE, 6); - DECLARE_SHAPE_CONFIG(BAR_HEIGHT, 7); - DECLARE_SHAPE_CONFIG(BAR_LEFT_MARGIN, 8); - DECLARE_SHAPE_CONFIG(TITLE_TEXT_POSITION_Y, 9); - DECLARE_SHAPE_CONFIG(BAR_OFFSET, 10); - DECLARE_SHAPE_CONFIG(ICON_WIDTH, 11); - DECLARE_SHAPE_CONFIG(ICON_HEIGHT, 12); - DECLARE_SHAPE_CONFIG(ICON_LEFT_MARGIN, 13); - DECLARE_SHAPE_CONFIG(ICON_RIGHT_MARGIN, 14); - DECLARE_SHAPE_CONFIG(TITLE_TEXT_POSITION_X, 15); - DECLARE_SHAPE_CONFIG(TITLE_TEXT_SIZE, 16); - DECLARE_SHAPE_CONFIG(TITLE_TEXT_HEIGHT, 17); - DECLARE_SHAPE_CONFIG(OVERLAY_WIDTH, 18); - DECLARE_SHAPE_CONFIG(OVERLAY_HEIGHT, 19); - DECLARE_SHAPE_CONFIG(OVERLAY_HEIGHT_WITHOUT_ARROW, 20); - DECLARE_SHAPE_CONFIG(OVERLAY_BOTTOM_MARGIN, 21); - DECLARE_SHAPE_CONFIG(OVERLAY_MARGIN, 22); - DECLARE_SHAPE_CONFIG(OVERLAY_TEXT_SIZE, 23); - DECLARE_SHAPE_CONFIG(NUMBER_SIZE, 24); - DECLARE_SHAPE_CONFIG(TEXT_SIZE, 25); - DECLARE_SHAPE_CONFIG(BAR_LEFT_MARGIN_WITH_ICON, 26); - DECLARE_SHAPE_CONFIG(MINIMUM_WIDTH_WITHOUT_ICON, 27); - DECLARE_SHAPE_CONFIG(MINIMUM_WIDTH_WITH_ICON, 28); - DECLARE_SHAPE_CONFIG(MINIMUM_HEIGHT, 29); + DECLARE_SHAPE_CONFIG(HANDLE_ONE_DIGIT_TEXT_SIZE, 3); + DECLARE_SHAPE_CONFIG(HANDLE_TWO_DIGIT_TEXT_SIZE, 4); + DECLARE_SHAPE_CONFIG(HANDLE_THREE_DIGIT_TEXT_SIZE, 5); + DECLARE_SHAPE_CONFIG(BAR_HEIGHT, 6); + DECLARE_SHAPE_CONFIG(BAR_LEFT_MARGIN, 7); + DECLARE_SHAPE_CONFIG(TITLE_TEXT_POSITION_Y, 8); + DECLARE_SHAPE_CONFIG(BAR_OFFSET, 9); + DECLARE_SHAPE_CONFIG(ICON_WIDTH, 10); + DECLARE_SHAPE_CONFIG(ICON_HEIGHT, 11); + DECLARE_SHAPE_CONFIG(ICON_LEFT_MARGIN, 12); + DECLARE_SHAPE_CONFIG(ICON_RIGHT_MARGIN, 13); + DECLARE_SHAPE_CONFIG(TITLE_TEXT_POSITION_X, 14); + DECLARE_SHAPE_CONFIG(TITLE_TEXT_SIZE, 15); + DECLARE_SHAPE_CONFIG(TITLE_TEXT_HEIGHT, 16); + DECLARE_SHAPE_CONFIG(OVERLAY_WIDTH, 17); + DECLARE_SHAPE_CONFIG(OVERLAY_HEIGHT, 18); + DECLARE_SHAPE_CONFIG(OVERLAY_HEIGHT_WITHOUT_ARROW, 19); + DECLARE_SHAPE_CONFIG(OVERLAY_BOTTOM_MARGIN, 20); + DECLARE_SHAPE_CONFIG(OVERLAY_MARGIN, 21); + DECLARE_SHAPE_CONFIG(OVERLAY_TEXT_SIZE, 22); + DECLARE_SHAPE_CONFIG(NUMBER_SIZE, 23); + DECLARE_SHAPE_CONFIG(TEXT_SIZE, 24); + DECLARE_SHAPE_CONFIG(MINIMUM_WIDTH_WITHOUT_ICON, 25); + DECLARE_SHAPE_CONFIG(MINIMUM_WIDTH_WITH_ICON, 26); + DECLARE_SHAPE_CONFIG(MINIMUM_HEIGHT, 27); DECLARE_END_UI_CONFIG(SLIDER); diff --git a/src/ui/resource/FUi_ResourceSliderConfig.cpp b/src/ui/resource/FUi_ResourceSliderConfig.cpp index b8dface..58bbe97 100644 --- a/src/ui/resource/FUi_ResourceSliderConfig.cpp +++ b/src/ui/resource/FUi_ResourceSliderConfig.cpp @@ -75,21 +75,19 @@ START_UI_CONFIG(SLIDER); { ADD_SHAPE_CONFIG(HANDLE_WIDTH, 72); ADD_SHAPE_CONFIG(HANDLE_HEIGHT, 72); - ADD_SHAPE_CONFIG(HANDLE_OFFSET, 8); ADD_SHAPE_CONFIG(HANDLE_ONE_DIGIT_TEXT_SIZE, 42); ADD_SHAPE_CONFIG(HANDLE_TWO_DIGIT_TEXT_SIZE, 34); ADD_SHAPE_CONFIG(HANDLE_THREE_DIGIT_TEXT_SIZE, 26); ADD_SHAPE_CONFIG(BAR_HEIGHT, 27); - ADD_SHAPE_CONFIG(BAR_LEFT_MARGIN_WITH_ICON, 26); - ADD_SHAPE_CONFIG(BAR_LEFT_MARGIN, 36); + ADD_SHAPE_CONFIG(BAR_LEFT_MARGIN, 45); ADD_SHAPE_CONFIG(BAR_OFFSET, 7); ADD_SHAPE_CONFIG(ICON_WIDTH, 72); ADD_SHAPE_CONFIG(ICON_HEIGHT, 72); ADD_SHAPE_CONFIG(ICON_LEFT_MARGIN, 26); - ADD_SHAPE_CONFIG(ICON_RIGHT_MARGIN, 16); + ADD_SHAPE_CONFIG(ICON_RIGHT_MARGIN, 30); ADD_SHAPE_CONFIG(TITLE_TEXT_POSITION_X, 12); ADD_SHAPE_CONFIG(TITLE_TEXT_POSITION_Y, 16); -- 2.7.4