From eeb9edc44fa5b18338f88c12d2fae394c193e7c6 Mon Sep 17 00:00:00 2001 From: Debajit Das Date: Mon, 23 Sep 2013 16:31:09 +0530 Subject: [PATCH] Reverting the overlay cropping issue fix Signed-off-by: Debajit Das Change-Id: I03e95ccb43f6ae28ba3fe79fcd40da37053e0fa0 --- src/ui/controls/FUiCtrl_SliderOverlay.cpp | 9 --------- src/ui/inc/FUi_ResourceSliderConfig.h | 1 - src/ui/resource/FUi_ResourceSliderConfig.cpp | 3 +-- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/ui/controls/FUiCtrl_SliderOverlay.cpp b/src/ui/controls/FUiCtrl_SliderOverlay.cpp index 84df37c..90dab5b 100644 --- a/src/ui/controls/FUiCtrl_SliderOverlay.cpp +++ b/src/ui/controls/FUiCtrl_SliderOverlay.cpp @@ -129,7 +129,6 @@ _SliderOverlay::DrawSliderOverlay(int positionX, int handleWidth, int value) int overlayTextSize = 0; float overlayBodyHeight = 0.0f; float overlayY = 0.0f; - float maxOverlayWidth = 0.0f; Point textPoint(0, 0); FloatDimension textDim(0.0f, 0.0f); @@ -154,9 +153,6 @@ _SliderOverlay::DrawSliderOverlay(int positionX, int handleWidth, int value) r = GET_SHAPE_CONFIG(SLIDER::OVERLAY_TEXT_SIZE, orientation, overlayTextSize); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - r = GET_SHAPE_CONFIG(SLIDER::MAXIMUM_OVERLAY_WIDTH, orientation, maxOverlayWidth); - SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - (_FontImpl::GetInstance(*__pFont))->SetSize(overlayTextSize); if (__overlayWidth == -1.0f) @@ -180,11 +176,6 @@ _SliderOverlay::DrawSliderOverlay(int positionX, int handleWidth, int value) overlayWidth = 2 * overlayLeftMargin + textDim.width; } - if (overlayWidth > maxOverlayWidth) - { - overlayWidth = maxOverlayWidth; - } - if (__sliderTouchRect.y > 0) { overlayY = __sliderTouchRect.y; diff --git a/src/ui/inc/FUi_ResourceSliderConfig.h b/src/ui/inc/FUi_ResourceSliderConfig.h index 8036d18..306c915 100644 --- a/src/ui/inc/FUi_ResourceSliderConfig.h +++ b/src/ui/inc/FUi_ResourceSliderConfig.h @@ -87,7 +87,6 @@ DECLARE_UI_CONFIG(SLIDER); DECLARE_SHAPE_CONFIG(MINIMUM_WIDTH_WITHOUT_ICON, 25); DECLARE_SHAPE_CONFIG(MINIMUM_WIDTH_WITH_ICON, 26); DECLARE_SHAPE_CONFIG(MINIMUM_HEIGHT, 27); - DECLARE_SHAPE_CONFIG(MAXIMUM_OVERLAY_WIDTH, 28); DECLARE_END_UI_CONFIG(SLIDER); diff --git a/src/ui/resource/FUi_ResourceSliderConfig.cpp b/src/ui/resource/FUi_ResourceSliderConfig.cpp index cda74ae..09fc8d2 100644 --- a/src/ui/resource/FUi_ResourceSliderConfig.cpp +++ b/src/ui/resource/FUi_ResourceSliderConfig.cpp @@ -81,7 +81,7 @@ START_UI_CONFIG(SLIDER); ADD_SHAPE_CONFIG(HANDLE_THREE_DIGIT_TEXT_SIZE, 26); ADD_SHAPE_CONFIG(BAR_HEIGHT, 27); - ADD_SHAPE_CONFIG(BAR_LEFT_MARGIN, 63); + ADD_SHAPE_CONFIG(BAR_LEFT_MARGIN, 45); ADD_SHAPE_CONFIG(BAR_OFFSET, 7); ADD_SHAPE_CONFIG(ICON_WIDTH, 72); @@ -108,7 +108,6 @@ START_UI_CONFIG(SLIDER); ADD_SHAPE_CONFIG(MINIMUM_WIDTH_WITH_ICON, 510); ADD_SHAPE_CONFIG(MINIMUM_HEIGHT, 68); - ADD_SHAPE_CONFIG(MAXIMUM_OVERLAY_WIDTH, 135); } END_UI_CONFIG_MODE(720x1280); -- 2.7.4