FloatRectangle contentRect(0.0f, 0.0f, 0.0f, 0.0f);
TextObject* pTextObject = __pButtonPresenter->GetTextObject();
+ Font* pFont = __pButtonPresenter->GetFont();
FloatRectangle previousRect = pTextObject->GetBoundsF();
FloatRectangle bounds(0.0f, 0.0f, contentRect.width - GetBoundsF().x - __leftMargin, dimension.height);
pTextObject->SetBounds(bounds);
pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_NONE);
+ pTextObject->SetFont(pFont, 0, pTextObject->GetTextLength());
pTextObject->Compose();
textSize = pTextObject->GetTextExtentF();
FloatRectangle bounds(0.0f, 0.0f, dimension.width, dimension.height);
pTextObject->SetBounds(bounds);
pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_NONE);
+ pTextObject->SetFont(pFont, 0, pTextObject->GetTextLength());
pTextObject->Compose();
textSize = pTextObject->GetTextExtentF();
FloatRectangle bounds(selectedBitmapMargin + leftTouchMargin,
__pButton->GetBoundsF().height - bottomTouchMargin - selectedBitmapHeight,
- __pButton->GetBoundsF().width - selectedBitmapMargin * 2 - (leftTouchMargin + rightTouchMargin), selectedBitmapHeight);
+ __pButton->GetBoundsF().width - selectedBitmapMargin * 2 - (leftTouchMargin + rightTouchMargin), selectedBitmapHeight + 1);
if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pUnderlineBitmap))
{
{
pCanvas->SetBackgroundColor(Color(0, 0, 0, 0));
pCanvas->Clear();
+
+ pHighlightedBgBitmap = __pCheckButton->GetBackgroundBitmap(__pCheckButton->GetGroupStyle(), _CHECK_BUTTON_STATUS_HIGHLIGHTED);
+
+ pHighlightedReColorBgBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pHighlightedBgBitmap,
+ Color::GetColor(COLOR_ID_MAGENTA), __pCheckButton->GetColor(_CHECK_BUTTON_STATUS_HIGHLIGHTED));
+
+ if (pHighlightedReColorBgBitmap && __highlightedIndex == 0)
+ {
+ if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pHighlightedReColorBgBitmap))
+ {
+ pCanvas->DrawNinePatchedBitmap(bounds, *pHighlightedReColorBgBitmap);
+ }
+ else
+ {
+ pCanvas->DrawBitmap(bounds, *pHighlightedReColorBgBitmap,
+ FloatRectangle(0.0f, 0.0f, pHighlightedReColorBgBitmap->GetWidthF(), pHighlightedReColorBgBitmap->GetHeightF()));
+ }
+ }
}
else
{
{
r = GET_SHAPE_CONFIG(FOOTER::SEGMENTED_ITEM_FONT_SIZE, GetCore().GetOrientation(), fontSize);
- if (footerItem.GetText() != L"" && __style != FOOTER_STYLE_TAB_LARGE)
+ if (footerItem.GetText() != L"" && __style != FOOTER_STYLE_TAB_LARGE && __style != FOOTER_STYLE_SEGMENTED_ICON)
{
GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize); //45
}
{
r = GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_FONT_SIZE, GetCore().GetOrientation(), fontSize);
- if (footerItem.GetText() != L"")
+ if (footerItem.GetText() != L"" && __style != FOOTER_STYLE_BUTTON_ICON)
{
GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize); //45
}
__lastHighlightedItemIndex = __highlightedItemIndex;
__highlighted = true;
}
+ else
+ {
+ if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+ {
+ __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+ __highlightedItemIndex++;
+ __lastHighlightedItemIndex = __highlightedItemIndex;
+ __highlighted = true;
+ }
+ }
}
else if (__highlightedItemIndex == __itemCount + 1)
{
ADD_IMAGE_CONFIG(OPTIONKEY_BG_EFFECT_NORMAL, #00_option_panel_handle_bg_ef.png); //not supported by theme
ADD_IMAGE_CONFIG(OPTIONKEY_BG_EFFECT_PRESSED, #00_option_panel_handle_bg_ef_press.png); //not supported by theme
- ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_VERTICAL, #00_effect_toolbar_tab_bounce_left.png);//98
- ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_VERTICAL, #00_effect_toolbar_tab_bounce_right.png);//98
- ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_HORIZONTAL, #00_effect_toolbar_tab_bounce_left_h.png);//85
- ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_HORIZONTAL, #00_effect_toolbar_tab_bounce_right_h.png);//85
+ ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_VERTICAL, #00_effect_footer_bounce_left.png);//98
+ ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_VERTICAL, #00_effect_footer_bounce_right.png);//98
+ ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_HORIZONTAL, #00_effect_footer_bounce_left_h.png);//85
+ ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_HORIZONTAL, #00_effect_footer_bounce_right_h.png);//85
ADD_IMAGE_CONFIG(TAB_TEXT_DIM_EFFECT_LEFT, #00_effect_tab_text_dim_left.#.png);
ADD_IMAGE_CONFIG(TAB_TEXT_DIM_EFFECT_RIGHT, #00_effect_tab_text_dim_right.#.png);
ADD_SHAPE_CONFIG(TAB_LARGE_HEIGHT, 126);
ADD_SHAPE_CONFIG(TAB_LARGE_TOP_MARGIN, 15);
- ADD_SHAPE_CONFIG(TAB_LARGE_TEXT_HEIGHT, 34);
+ ADD_SHAPE_CONFIG(TAB_LARGE_TEXT_HEIGHT, 38);
ADD_SHAPE_CONFIG(TAB_LARGE_DIVIDER_HEIGHT, 88);
ADD_SHAPE_CONFIG(TAB_TEXT_DIM_WIDTH, 45);
ADD_SHAPE_CONFIG(TAB_LARGE_HEIGHT, 126);
ADD_SHAPE_CONFIG(TAB_LARGE_TOP_MARGIN, 15);
- ADD_SHAPE_CONFIG(TAB_LARGE_TEXT_HEIGHT, 34);
+ ADD_SHAPE_CONFIG(TAB_LARGE_TEXT_HEIGHT, 38);
ADD_SHAPE_CONFIG(TAB_LARGE_DIVIDER_HEIGHT, 88);
ADD_SHAPE_CONFIG(TAB_TEXT_DIM_WIDTH, 45);
projects / platform / framework / native / uifw.git / commitdiff
