_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));
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;
}
result
-_SliderOverlay::LoadBitmaps(FloatDimension& dim)
+_SliderOverlay::LoadBitmaps()
{
result r = E_SUCCESS;
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;
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);
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)
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))
{
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);