From: kishorekumar Dachinamoorthy Date: Mon, 15 Apr 2013 12:23:38 +0000 (+0530) Subject: Implementing Overlay resizing. X-Git-Tag: accepted/tizen_2.1/20130425.033138~185^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5173982443ca52fec51e59de0ac1ae2b42291e6f;p=framework%2Fosp%2Fuifw.git Implementing Overlay resizing. Change-Id: I87779fdeaa76ba9d402dc07ab49ab90973a37a92 Signed-off-by: kishorekumar Dachinamoorthy --- diff --git a/src/ui/controls/FUiCtrl_SliderOverlay.cpp b/src/ui/controls/FUiCtrl_SliderOverlay.cpp index 10ef0ff..89c387b 100755 --- a/src/ui/controls/FUiCtrl_SliderOverlay.cpp +++ b/src/ui/controls/FUiCtrl_SliderOverlay.cpp @@ -62,7 +62,6 @@ result _SliderOverlay::Construct(void) { result r = E_SUCCESS; - _ControlOrientation orientation = _ControlManager::GetInstance()->GetOrientation(); r = CreateRootVisualElement(); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); @@ -77,14 +76,7 @@ _SliderOverlay::Construct(void) r = GET_COLOR_CONFIG(SLIDER::OVERLAY_TEXT_NORMAL, __overlayTextColor); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - FloatDimension dim(0.0f, 0.0f); - r = GET_SHAPE_CONFIG(SLIDER::OVERLAY_WIDTH, orientation, dim.width); - SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - - r = GET_SHAPE_CONFIG(SLIDER::OVERLAY_HEIGHT, orientation, dim.height); - SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - - r = LoadBitmaps(dim); + r = LoadBitmaps(); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); return r; @@ -107,7 +99,7 @@ _SliderOverlay::SetFont(Tizen::Graphics::Font* pFont) } result -_SliderOverlay::LoadBitmaps(FloatDimension& dim) +_SliderOverlay::LoadBitmaps() { result r = E_SUCCESS; @@ -150,11 +142,13 @@ _SliderOverlay::DrawSliderOverlay(int positionX, int handleWidth, int value) float overlayWidth = 0.0f; float overlayHeight = 0.0f; float overlayBottomMargin = 0.0f; + float overlayLeftMargin = 0.0f; int overlayTextSize = 0; float overlayBodyHeight = 0.0f; float overlayY = 0.0f; Point textPoint(0, 0); bool isCustomBitmap = false; + FloatDimension textDim(0.0f, 0.0f); Bitmap* pBgBitmap = __pOverlayBgBitmap; Bitmap* pEffectBgBitmap = __pOverlayBgEffectBitmap; @@ -164,7 +158,7 @@ _SliderOverlay::DrawSliderOverlay(int positionX, int handleWidth, int value) text.Append(value); _ControlOrientation orientation = _ControlManager::GetInstance()->GetOrientation(); - r = GET_SHAPE_CONFIG(SLIDER::OVERLAY_WIDTH, orientation, overlayWidth); + r = GET_SHAPE_CONFIG(SLIDER::OVERLAY_MARGIN, orientation, overlayLeftMargin); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); r = GET_SHAPE_CONFIG(SLIDER::OVERLAY_HEIGHT, orientation, overlayHeight); @@ -176,20 +170,20 @@ _SliderOverlay::DrawSliderOverlay(int positionX, int handleWidth, int value) r = GET_SHAPE_CONFIG(SLIDER::OVERLAY_HEIGHT_WITHOUT_ARROW, orientation, overlayBodyHeight); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - if (text.GetLength() == SLIDER_OVERLAY_THREE_DIGIT) - { - r = GET_SHAPE_CONFIG(SLIDER::OVERLAY_TEXT_SIZE_THREE_CHARACTERS, orientation, overlayTextSize); - SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - } - else if (text.GetLength() == SLIDER_OVERLAY_TWO_DIGIT) + r = GET_SHAPE_CONFIG(SLIDER::OVERLAY_TEXT_SIZE, orientation, overlayTextSize); + SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); + + (_FontImpl::GetInstance(*__pFont))->SetSize(overlayTextSize); + __pFont->GetTextExtent(text, text.GetLength(), textDim); + + if (text.GetLength() == SLIDER_OVERLAY_SINGLE_DIGIT) { - r = GET_SHAPE_CONFIG(SLIDER::OVERLAY_TEXT_SIZE_TWO_CHARACTERS, orientation, overlayTextSize); + r = GET_SHAPE_CONFIG(SLIDER::OVERLAY_WIDTH, orientation, overlayWidth); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); } else { - r = GET_SHAPE_CONFIG(SLIDER::OVERLAY_TEXT_SIZE_ONE_CHARACTER, orientation, overlayTextSize); - SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); + overlayWidth = 2 * overlayLeftMargin + textDim.width; } if (__sliderTouchRect.y > 0) @@ -216,16 +210,10 @@ _SliderOverlay::DrawSliderOverlay(int positionX, int handleWidth, int value) pCanvas->SetBackgroundColor(Color(0x00000000)); pCanvas->Clear(); - (_FontImpl::GetInstance(*__pFont))->SetSize(overlayTextSize); - pCanvas->SetFont(*__pFont); // Draw BG FloatRectangle overlayRect = FloatRectangle(0.0f, 0.0f, __sliderOverlayRect.width, __sliderOverlayRect.height); - FloatDimension textDim(0.0f, 0.0f); - - - __pFont->GetTextExtent(text, text.GetLength(), textDim); if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBgBitmap)) { diff --git a/src/ui/inc/FUiCtrl_SliderOverlay.h b/src/ui/inc/FUiCtrl_SliderOverlay.h index b348963..8847ff4 100644 --- a/src/ui/inc/FUiCtrl_SliderOverlay.h +++ b/src/ui/inc/FUiCtrl_SliderOverlay.h @@ -49,15 +49,14 @@ public: virtual bool IsActivatedOnOpen(void) const; private: - result LoadBitmaps(Tizen::Graphics::FloatDimension& dim); + result LoadBitmaps(void); _SliderOverlay(const _SliderOverlay&); _SliderOverlay& operator =(const _SliderOverlay&); private: - static const int SLIDER_OVERLAY_THREE_DIGIT = 3; - static const int SLIDER_OVERLAY_TWO_DIGIT = 2; + static const int SLIDER_OVERLAY_SINGLE_DIGIT = 1; Tizen::Graphics::FloatRectangle __sliderRect; Tizen::Graphics::FloatRectangle __sliderTouchRect; diff --git a/src/ui/inc/FUi_ResourceSliderConfig.h b/src/ui/inc/FUi_ResourceSliderConfig.h index 8004462..57bddfe 100755 --- a/src/ui/inc/FUi_ResourceSliderConfig.h +++ b/src/ui/inc/FUi_ResourceSliderConfig.h @@ -73,20 +73,16 @@ DECLARE_UI_CONFIG(SLIDER); DECLARE_SHAPE_CONFIG(OVERLAY_HEIGHT, 20); DECLARE_SHAPE_CONFIG(OVERLAY_HEIGHT_WITHOUT_ARROW, 21); DECLARE_SHAPE_CONFIG(OVERLAY_BOTTOM_MARGIN, 22); - DECLARE_SHAPE_CONFIG(OVERLAY_TEXT_SIZE_ONE_CHARACTER, 23); - DECLARE_SHAPE_CONFIG(OVERLAY_TEXT_SIZE_TWO_CHARACTERS, 24); - DECLARE_SHAPE_CONFIG(OVERLAY_TEXT_SIZE_THREE_CHARACTERS, 25); - DECLARE_SHAPE_CONFIG(OVERLAY_TEXT_POSITION_Y_ONE_CHARACTER, 26); - DECLARE_SHAPE_CONFIG(OVERLAY_TEXT_POSITION_Y_TWO_CHARACTERS, 27); - DECLARE_SHAPE_CONFIG(OVERLAY_TEXT_POSITION_Y_THREE_CHARACTERS, 28); - DECLARE_SHAPE_CONFIG(NUMBER_SIZE, 29); - DECLARE_SHAPE_CONFIG(TEXT_SIZE, 30); - DECLARE_SHAPE_CONFIG(MINIMUM_SIZE_WITHOUT_ICON, 31); - DECLARE_SHAPE_CONFIG(MINIMUM_SIZE_WITH_ICON, 32); - DECLARE_SHAPE_CONFIG(BAR_LEFT_MARGIN_WITH_ICON, 33); - DECLARE_SHAPE_CONFIG(MINIMUM_WIDTH_WITHOUT_ICON, 34); - DECLARE_SHAPE_CONFIG(MINIMUM_WIDTH_WITH_ICON, 35); - DECLARE_SHAPE_CONFIG(MINIMUM_HEIGHT, 36); + DECLARE_SHAPE_CONFIG(OVERLAY_MARGIN, 23); + DECLARE_SHAPE_CONFIG(OVERLAY_TEXT_SIZE, 24); + DECLARE_SHAPE_CONFIG(NUMBER_SIZE, 25); + DECLARE_SHAPE_CONFIG(TEXT_SIZE, 26); + DECLARE_SHAPE_CONFIG(MINIMUM_SIZE_WITHOUT_ICON, 27); + DECLARE_SHAPE_CONFIG(MINIMUM_SIZE_WITH_ICON, 28); + DECLARE_SHAPE_CONFIG(BAR_LEFT_MARGIN_WITH_ICON, 29); + DECLARE_SHAPE_CONFIG(MINIMUM_WIDTH_WITHOUT_ICON, 30); + DECLARE_SHAPE_CONFIG(MINIMUM_WIDTH_WITH_ICON, 31); + DECLARE_SHAPE_CONFIG(MINIMUM_HEIGHT, 32); DECLARE_FIXED_VALUE_CONFIG(TITLE_TEXT_LENGTH_MAX, 1); DECLARE_END_UI_CONFIG(SLIDER); diff --git a/src/ui/resource/FUi_ResourceSliderConfig.cpp b/src/ui/resource/FUi_ResourceSliderConfig.cpp index d4578ab..6298a50 100755 --- a/src/ui/resource/FUi_ResourceSliderConfig.cpp +++ b/src/ui/resource/FUi_ResourceSliderConfig.cpp @@ -89,13 +89,9 @@ START_UI_CONFIG(SLIDER); ADD_SHAPE_CONFIG(OVERLAY_HEIGHT, 108); ADD_SHAPE_CONFIG(OVERLAY_HEIGHT_WITHOUT_ARROW, 86); ADD_SHAPE_CONFIG(OVERLAY_BOTTOM_MARGIN, 0); + ADD_SHAPE_CONFIG(OVERLAY_MARGIN, 12); - ADD_SHAPE_CONFIG(OVERLAY_TEXT_SIZE_ONE_CHARACTER, 80); - ADD_SHAPE_CONFIG(OVERLAY_TEXT_SIZE_TWO_CHARACTERS, 64); - ADD_SHAPE_CONFIG(OVERLAY_TEXT_SIZE_THREE_CHARACTERS, 48); - ADD_SHAPE_CONFIG(OVERLAY_TEXT_POSITION_Y_ONE_CHARACTER, 5); - ADD_SHAPE_CONFIG(OVERLAY_TEXT_POSITION_Y_TWO_CHARACTERS, 14); - ADD_SHAPE_CONFIG(OVERLAY_TEXT_POSITION_Y_THREE_CHARACTERS, 22); + ADD_SHAPE_CONFIG(OVERLAY_TEXT_SIZE, 72); ADD_SHAPE_CONFIG(NUMBER_SIZE, 58); ADD_SHAPE_CONFIG(TEXT_SIZE, 28);