FOOTER_STYLE_SEGMENTED_TEXT, /**< The text segmented style */
FOOTER_STYLE_SEGMENTED_ICON, /**< The icon segmented style */
FOOTER_STYLE_SEGMENTED_ICON_TEXT, /**< The icon and text segmented style */
- FOOTER_STYLE_TAB /**< The tab style */
+ FOOTER_STYLE_TAB, /**< The tab style */
+ FOOTER_STYLE_TAB_LARGE /**< The large tab style @b Since: @b 2.2 */
};
/**
* The specified item is not constructed.
* @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation.@n
* There are more than 2 footer items.
- * @exception E_UNSUPPORTED_OPERATION The operation is not supported when the style of the %Footer control is ::FOOTER_STYLE_TAB.
+ * @exception E_UNSUPPORTED_OPERATION The operation is not supported when the style of the %Footer control is ::FOOTER_STYLE_TAB or ::FOOTER_STYLE_TAB_LARGE.
* @exception E_SYSTEM A system error has occurred.
*/
result SetButton(ButtonPosition position, const ButtonItem& button);
* @param[in] pBadgeIcon The bitmap for the icon
* @exception E_SUCCESS The method is successful.
* @exception E_UNSUPPORTED_OPERATION This operation is not supported. @n
- * The operation is not supported when the style of the %Footer control is ::FOOTER_STYLE_TAB.
+ * The operation is not supported when the style of the %Footer control is ::FOOTER_STYLE_TAB or ::FOOTER_STYLE_TAB_LARGE.
*/
result SetButtonBadgeIcon(ButtonPosition position, const Tizen::Graphics::Bitmap* pBadgeIcon);
* @exception E_SUCCESS The method is successful.
* @exception E_INVALID_ARG The specified @c number must be in the range defined by @c 0 and @c 99999.
* @exception E_UNSUPPORTED_OPERATION This operation is not supported. @n
- * The operation is not supported when the style of the %Footer control is ::FOOTER_STYLE_TAB.
+ * The operation is not supported when the style of the %Footer control is ::FOOTER_STYLE_TAB or ::FOOTER_STYLE_TAB_LARGE.
*/
result SetButtonNumberedBadgeIcon(ButtonPosition position, int number);
* @return An error code
* @exception E_SUCCESS The method is successful.
* @exception E_UNSUPPORTED_OPERATION This operation is not supported. @n
- * The operation is not supported when the style of the %Footer control is ::FOOTER_STYLE_TAB. @n
+ * The operation is not supported when the style of the %Footer control is ::FOOTER_STYLE_TAB or ::FOOTER_STYLE_TAB_LARGE. @n
* This device does not support the software back button.
* @exception E_SYSTEM A system error has occurred.
* @remarks
* @param[in] enable Set to @c true to enable the edit mode, @n
* else @c false
* @exception E_SUCCESS The method is successful.
- * @exception E_UNSUPPORTED_OPERATION The operation is supported when the style of the %Footer control style is ::FOOTER_STYLE_TAB.
+ * @exception E_UNSUPPORTED_OPERATION The operation is supported when the style of the %Footer control style is ::FOOTER_STYLE_TAB or ::FOOTER_STYLE_TAB_LARGE.
*/
result SetTabEditModeEnabled(bool enable);
* @exception E_SUCCESS The method is successful.
* @exception E_INVALID_OPERATION This exception is returned when there are more than 3 footer items.
* @exception E_UNSUPPORTED_OPERATION This operation is not supported. @n
- * The operation is not supported when the style of the %Footer control is ::FOOTER_STYLE_TAB.
+ * The operation is not supported when the style of the %Footer control is ::FOOTER_STYLE_TAB or ::FOOTER_STYLE_TAB_LARGE.
* @exception E_SYSTEM A System error has occurred.
* @remarks If the left button is already set, then the button is replaced with the Menu button.
*/
HEADER_STYLE_SEGMENTED_WITH_TITLE, /**< The segmented style with title */
HEADER_STYLE_TAB, /**< The tab style */
HEADER_STYLE_TAB_WITH_TITLE, /**< The tab with title style */
- HEADER_STYLE_BUTTON /**< The button style */
+ HEADER_STYLE_BUTTON, /**< The button style */
+ HEADER_STYLE_TAB_LARGE /**< The large tab style @b Since: @b 2.2 */
};
/**
* @return The selected item index, @n
* else @c -1 if an error occurs
* @exception E_SUCCESS The method is successful.
- * @exception E_UNSUPPORTED_OPERATION This operation is supported when the style of the %Header control is
- * ::HEADER_STYLE_SEGMENTED, @n ::HEADER_STYLE_SEGMENTED_WITH_TITLE,
- ::HEADER_STYLE_TAB or ::HEADER_STYLE_TAB_WITH_TITLE.
+ * @exception E_UNSUPPORTED_OPERATION This operation is supported when the style of the %Header control is ::HEADER_STYLE_SEGMENTED, @n
+ * ::HEADER_STYLE_SEGMENTED_WITH_TITLE, ::HEADER_STYLE_TAB, ::HEADER_STYLE_TAB_WITH_TITLE or ::HEADER_STYLE_TAB_LARGE.
* @remarks The specific error code can be accessed using the GetLastResult() method.
*/
int GetSelectedItemIndex(void) const;
* @param[in] pBadgeIcon The bitmap for the icon
* @exception E_SUCCESS The method is successful.
* @exception E_UNSUPPORTED_OPERATION This operation is not supported. @n
- * The operation is not supported when the style of the %Header control is ::HEADER_STYLE_TAB or ::HEADER_STYLE_TAB_WITH_TITLE.
+ * The operation is not supported when the style of the %Header control is ::HEADER_STYLE_TAB, @n
+ * ::HEADER_STYLE_TAB_WITH_TITLE or ::HEADER_STYLE_TAB_LARGE.
*/
result SetButtonBadgeIcon(ButtonPosition position, const Tizen::Graphics::Bitmap* pBadgeIcon);
* @exception E_SUCCESS The method is successful.
* @exception E_INVALID_ARG The specified @c number must be in the range defined by @c 0 and @c 99999.
* @exception E_UNSUPPORTED_OPERATION This operation is not supported. @n
- * The operation is not supported when the style of the %Header control is ::HEADER_STYLE_TAB or ::HEADER_STYLE_TAB_WITH_TITLE.
+ * The operation is not supported when the style of the %Header control is ::HEADER_STYLE_TAB, @n
+ * ::HEADER_STYLE_TAB_WITH_TITLE or ::HEADER_STYLE_TAB_LARGE.
* @remarks To remove the numbered badge icon from an item, pass @c 0 as the value of @c number.
*/
result SetButtonNumberedBadgeIcon(ButtonPosition position, int number);
* @param[in] enable Set to @c true to enable the edit mode, @n
* else @c false
* @exception E_SUCCESS The method is successful.
- * @exception E_UNSUPPORTED_OPERATION The operation is supported when the style of the %Header control style is ::HEADER_STYLE_TAB @n
- * or ::HEADER_STYLE_TAB_WITH_TITLE.
+ * @exception E_UNSUPPORTED_OPERATION The operation is supported when the style of the %Header control style is ::HEADER_STYLE_TAB, @n
+ * ::HEADER_STYLE_TAB_WITH_TITLE or ::HEADER_STYLE_TAB_LARGE.
*/
result SetTabEditModeEnabled(bool enable);
, __topTouchMargin(0.0f)
, __rightTouchMargin(0.0f)
, __bottomTouchMargin(0.0f)
- , __drawInner(false)
, __userDefinedTextArea(0.0f, 0.0f, 0.0f, 0.0f)
, __pTextElement(null)
{
}
result
-_Button::SetUnderlineBitmap(const Tizen::Graphics::Bitmap& bitmap, bool drawInner)
+_Button::SetUnderlineBitmap(const Tizen::Graphics::Bitmap& bitmap)
{
result r = E_SYSTEM;
r = E_SUCCESS;
}
- __drawInner = drawInner;
-
return r;
}
-bool
-_Button::IsDrawInner(void) const
-{
- return __drawInner;
-}
-
result
_Button::ShowUnderlineBitmap(bool show)
{
float segmentedHeight = 0.0f;
float leftTouchMargin = __pButton->GetLeftTouchMarginF();
- float topTouchMargin = __pButton->GetTopTouchMarginF();
float rightTouchMargin = __pButton->GetRightTouchMarginF();
float bottomTouchMargin = __pButton->GetBottomTouchMarginF();
Bitmap* pUnderlineBitmap = __pButton->GetUnderlineBitmap();
- bool isDrawInner = __pButton->IsDrawInner();
-
if (pUnderlineBitmap)
{
Canvas* pCanvas = __pButton->GetCanvasN();
}
FloatRectangle bounds(selectedBitmapMargin + leftTouchMargin,
- __pButton->GetBoundsF().height - (topTouchMargin + bottomTouchMargin) - (__pButton->GetBoundsF().height - (topTouchMargin + bottomTouchMargin) - segmentedHeight) / 2,
+ __pButton->GetBoundsF().height - bottomTouchMargin - selectedBitmapHeight,
__pButton->GetBoundsF().width - selectedBitmapMargin * 2 - (leftTouchMargin + rightTouchMargin), selectedBitmapHeight);
- if (isDrawInner)
- {
- bounds.y -= (selectedBitmapHeight - bottomTouchMargin);
- }
-
if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pUnderlineBitmap))
{
pCanvas->DrawNinePatchedBitmap(bounds, *pUnderlineBitmap);
__pMarkBitmap[i] = null;
__pOnOffBgNormalBitmap[i] = null;
__pOnOffBitmap[i] = null;
- __pOnOffSlidingOnBgBitmap[i] = null;
- __pOnOffSlidingOffBgBitmap[i] = null;
- __pOnOffSlidingHandlerBitmap[i] = null;
+ __pOnOffSlidingBgBitmap[i] = null;
+ __pOnOffSlidingOnHandlerBitmap[i] = null;
+ __pOnOffSlidingOffHandlerBitmap[i] = null;
__pCircleBitmap[i] = null;
__pDetailedRightBitmap[i] = null;
__pOnOffBitmap[i] = null;
}
- if (__pOnOffSlidingOnBgBitmap[i])
+ if (__pOnOffSlidingBgBitmap[i])
{
- delete __pOnOffSlidingOnBgBitmap[i];
- __pOnOffSlidingOnBgBitmap[i] = null;
+ delete __pOnOffSlidingBgBitmap[i];
+ __pOnOffSlidingBgBitmap[i] = null;
}
- if (__pOnOffSlidingOffBgBitmap[i])
+ if (__pOnOffSlidingOnHandlerBitmap[i])
{
- delete __pOnOffSlidingOffBgBitmap[i];
- __pOnOffSlidingOffBgBitmap[i] = null;
+ delete __pOnOffSlidingOnHandlerBitmap[i];
+ __pOnOffSlidingOnHandlerBitmap[i] = null;
}
- if (__pOnOffSlidingHandlerBitmap[i])
+ if (__pOnOffSlidingOffHandlerBitmap[i])
{
- delete __pOnOffSlidingHandlerBitmap[i];
- __pOnOffSlidingHandlerBitmap[i] = null;
+ delete __pOnOffSlidingOffHandlerBitmap[i];
+ __pOnOffSlidingOffHandlerBitmap[i] = null;
}
if (__pCircleBitmap[i])
r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_ICON_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_ICON_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
- r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_ON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOnBgBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
- r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_ON_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOnBgBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
- r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_ON_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOnBgBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
- r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_ON_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOnBgBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
- r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_ON_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOnBgBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
+ r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingBgBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
+ r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingBgBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
+ r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingBgBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
+ r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingBgBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+ r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingBgBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
- r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_OFF_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOffBgBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
- r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_OFF_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOffBgBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
- r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_OFF_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOffBgBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
- r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_OFF_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOffBgBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
- r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_OFF_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOffBgBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
+ r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_ON_HANDLER_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOnHandlerBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
+ r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_ON_HANDLER_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOnHandlerBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
+ r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_ON_HANDLER_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOnHandlerBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
+ r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_ON_HANDLER_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOnHandlerBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+ r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_ON_HANDLER_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOnHandlerBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
- r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_HANDLER_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingHandlerBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
- r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_HANDLER_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingHandlerBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
- r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_HANDLER_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingHandlerBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
- r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_HANDLER_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingHandlerBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
- r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_HANDLER_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingHandlerBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
+ r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_OFF_HANDLER_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOffHandlerBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
+ r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_OFF_HANDLER_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOffHandlerBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
+ r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_OFF_HANDLER_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOffHandlerBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
+ r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_OFF_HANDLER_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOffHandlerBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+ r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_OFF_HANDLER_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOffHandlerBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pCircleBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pCircleBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
}
Bitmap*
-_CheckButton::GetOnOffSlidingOnBgBitmap(_CheckButtonStatus checkButtonStatus) const
+_CheckButton::GetOnOffSlidingBgBitmap(_CheckButtonStatus checkButtonStatus) const
{
- return __pOnOffSlidingOnBgBitmap[checkButtonStatus];
+ return __pOnOffSlidingBgBitmap[checkButtonStatus];
}
Bitmap*
-_CheckButton::GetOnOffSlidingOffBgBitmap(_CheckButtonStatus checkButtonStatus) const
+_CheckButton::GetOnOffSlidingOnHandlerBitmap(_CheckButtonStatus checkButtonStatus) const
{
- return __pOnOffSlidingOffBgBitmap[checkButtonStatus];
+ return __pOnOffSlidingOnHandlerBitmap[checkButtonStatus];
}
Bitmap*
-_CheckButton::GetOnOffSlidingHandlerBitmap(_CheckButtonStatus checkButtonStatus) const
+_CheckButton::GetOnOffSlidingOffHandlerBitmap(_CheckButtonStatus checkButtonStatus) const
{
- return __pOnOffSlidingHandlerBitmap[checkButtonStatus];
+ return __pOnOffSlidingOffHandlerBitmap[checkButtonStatus];
}
Bitmap*
{
if (checkStatus == _CHECK_BUTTON_STATUS_NORMAL)
{
- Bitmap* pOnOffSlidingOffNormalBitmap = __pCheckButton->GetOnOffSlidingOffBgBitmap(_CHECK_BUTTON_STATUS_NORMAL);
+ Bitmap* pOnOffSlidingNormalBgBitmap = __pCheckButton->GetOnOffSlidingBgBitmap(_CHECK_BUTTON_STATUS_NORMAL);
- if (pOnOffSlidingOffNormalBitmap)
+ if (pOnOffSlidingNormalBgBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingOffNormalBitmap);
+ pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingNormalBgBitmap);
}
- Bitmap* pOnOffSlidingHandlerNormalBitmap = __pCheckButton->GetOnOffSlidingHandlerBitmap(_CHECK_BUTTON_STATUS_NORMAL);
+ Bitmap* pOnOffSlidingOffHandlerNormalBitmap = __pCheckButton->GetOnOffSlidingOffHandlerBitmap(_CHECK_BUTTON_STATUS_NORMAL);
- if (pOnOffSlidingHandlerNormalBitmap)
+ if (pOnOffSlidingOffHandlerNormalBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingHandlerNormalBitmap);
+ pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingOffHandlerNormalBitmap);
}
}
else if (checkStatus == _CHECK_BUTTON_STATUS_DISABLED)
{
- Bitmap* pOnOffSlidingOffDisabledBitmap = __pCheckButton->GetOnOffSlidingOffBgBitmap(_CHECK_BUTTON_STATUS_DISABLED);
+ Bitmap* pOnOffSlidingDisabledBgBitmap = __pCheckButton->GetOnOffSlidingBgBitmap(_CHECK_BUTTON_STATUS_DISABLED);
- if (pOnOffSlidingOffDisabledBitmap)
+ if (pOnOffSlidingDisabledBgBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingOffDisabledBitmap);
+ pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingDisabledBgBitmap);
}
- Bitmap* pOnOffSlidingHandlerDisabledBitmap = __pCheckButton->GetOnOffSlidingHandlerBitmap(_CHECK_BUTTON_STATUS_DISABLED);
+ Bitmap* pOnOffSlidingOffHandlerDisabledBitmap = __pCheckButton->GetOnOffSlidingOffHandlerBitmap(_CHECK_BUTTON_STATUS_DISABLED);
- if (pOnOffSlidingHandlerDisabledBitmap)
+ if (pOnOffSlidingOffHandlerDisabledBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingHandlerDisabledBitmap);
+ pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingOffHandlerDisabledBitmap);
}
}
else if (checkStatus == _CHECK_BUTTON_STATUS_PRESSED)
{
- Bitmap* pOnOffSlidingOffPressedBitmap = __pCheckButton->GetOnOffSlidingOffBgBitmap(_CHECK_BUTTON_STATUS_PRESSED);
+ Bitmap* pOnOffSlidingPressedBgBitmap = __pCheckButton->GetOnOffSlidingBgBitmap(_CHECK_BUTTON_STATUS_PRESSED);
- if (pOnOffSlidingOffPressedBitmap)
+ if (pOnOffSlidingPressedBgBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingOffPressedBitmap);
+ pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingPressedBgBitmap);
}
- Bitmap* pOnOffSlidingHandlerPressedBitmap = __pCheckButton->GetOnOffSlidingHandlerBitmap(_CHECK_BUTTON_STATUS_PRESSED);
+ Bitmap* pOnOffSlidingOffHandlerPressedBitmap = __pCheckButton->GetOnOffSlidingOffHandlerBitmap(_CHECK_BUTTON_STATUS_PRESSED);
- if (pOnOffSlidingHandlerPressedBitmap)
+ if (pOnOffSlidingOffHandlerPressedBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingHandlerPressedBitmap);
+ pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingOffHandlerPressedBitmap);
}
}
else if (checkStatus == _CHECK_BUTTON_STATUS_HIGHLIGHTED)
{
- Bitmap* pOnOffSlidingOffHighlightedBitmap = __pCheckButton->GetOnOffSlidingOffBgBitmap(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
+ Bitmap* pOnOffSlidingHighlightedBgBitmap = __pCheckButton->GetOnOffSlidingBgBitmap(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
- if (pOnOffSlidingOffHighlightedBitmap)
+ if (pOnOffSlidingHighlightedBgBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingOffHighlightedBitmap);
+ pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingHighlightedBgBitmap);
}
- Bitmap* pOnOffSlidingHandlerNormalBitmap = __pCheckButton->GetOnOffSlidingHandlerBitmap(_CHECK_BUTTON_STATUS_NORMAL);
+ Bitmap* pOnOffSlidingOffHandlerNormalBitmap = __pCheckButton->GetOnOffSlidingOffHandlerBitmap(_CHECK_BUTTON_STATUS_NORMAL);
- if (pOnOffSlidingHandlerNormalBitmap)
+ if (pOnOffSlidingOffHandlerNormalBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingHandlerNormalBitmap);
+ pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingOffHandlerNormalBitmap);
}
- Bitmap* pOnOffSlidingHandlerHighlightedBitmap = __pCheckButton->GetOnOffSlidingHandlerBitmap(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
+ Bitmap* pOnOffSlidingOffHandlerHighlightedBitmap = __pCheckButton->GetOnOffSlidingOffHandlerBitmap(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
- if (pOnOffSlidingHandlerHighlightedBitmap)
+ if (pOnOffSlidingOffHandlerHighlightedBitmap)
{
- pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pOnOffSlidingHandlerHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA),
+ pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pOnOffSlidingOffHandlerHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA),
detailedHighlightedBackgroundColor);
}
}
else if (checkStatus == _CHECK_BUTTON_STATUS_SELECTED)
{
- Bitmap* pOnOffSlidingOffSelectedBitmap = __pCheckButton->GetOnOffSlidingOffBgBitmap(_CHECK_BUTTON_STATUS_SELECTED);
+ Bitmap* pOnOffSlidingSelectedBgBitmap = __pCheckButton->GetOnOffSlidingBgBitmap(_CHECK_BUTTON_STATUS_SELECTED);
- if (pOnOffSlidingOffSelectedBitmap)
+ if (pOnOffSlidingSelectedBgBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingOffSelectedBitmap);
+ pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingSelectedBgBitmap);
}
- Bitmap* pOnOffSlidingHandlerSelectedBitmap = __pCheckButton->GetOnOffSlidingHandlerBitmap(_CHECK_BUTTON_STATUS_SELECTED);
+ Bitmap* pOnOffSlidingOffHandlerSelectedBitmap = __pCheckButton->GetOnOffSlidingOffHandlerBitmap(_CHECK_BUTTON_STATUS_SELECTED);
- if (pOnOffSlidingHandlerSelectedBitmap)
+ if (pOnOffSlidingOffHandlerSelectedBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingHandlerSelectedBitmap);
+ pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingOffHandlerSelectedBitmap);
}
}
}
{
if (checkStatus == _CHECK_BUTTON_STATUS_NORMAL)
{
- Bitmap* pOnOffSlidingOnNormalBitmap = __pCheckButton->GetOnOffSlidingOnBgBitmap(_CHECK_BUTTON_STATUS_NORMAL);
+ Bitmap* pOnOffSlidingNormalBgBitmap = __pCheckButton->GetOnOffSlidingBgBitmap(_CHECK_BUTTON_STATUS_NORMAL);
- if (pOnOffSlidingOnNormalBitmap)
+ if (pOnOffSlidingNormalBgBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingOnNormalBitmap);
+ pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingNormalBgBitmap);
}
- Bitmap* pOnOffSlidingHandlerNormalBitmap = __pCheckButton->GetOnOffSlidingHandlerBitmap(_CHECK_BUTTON_STATUS_NORMAL);
+ Bitmap* pOnOffSlidingOnHandlerNormalBitmap = __pCheckButton->GetOnOffSlidingOnHandlerBitmap(_CHECK_BUTTON_STATUS_NORMAL);
- if (pOnOffSlidingHandlerNormalBitmap)
+ if (pOnOffSlidingOnHandlerNormalBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingHandlerNormalBitmap);
+ pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingOnHandlerNormalBitmap);
}
}
else if (checkStatus == _CHECK_BUTTON_STATUS_DISABLED)
{
- Bitmap* pOnOffSlidingOnDisabledBitmap = __pCheckButton->GetOnOffSlidingOnBgBitmap(_CHECK_BUTTON_STATUS_DISABLED);
+ Bitmap* pOnOffSlidingDisabledBgBitmap = __pCheckButton->GetOnOffSlidingBgBitmap(_CHECK_BUTTON_STATUS_DISABLED);
- if (pOnOffSlidingOnDisabledBitmap)
+ if (pOnOffSlidingDisabledBgBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingOnDisabledBitmap);
+ pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingDisabledBgBitmap);
}
- Bitmap* pOnOffSlidingHandlerDisabledBitmap = __pCheckButton->GetOnOffSlidingHandlerBitmap(_CHECK_BUTTON_STATUS_DISABLED);
+ Bitmap* pOnOffSlidingOnHandlerDisabledBitmap = __pCheckButton->GetOnOffSlidingOnHandlerBitmap(_CHECK_BUTTON_STATUS_DISABLED);
- if (pOnOffSlidingHandlerDisabledBitmap)
+ if (pOnOffSlidingOnHandlerDisabledBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingHandlerDisabledBitmap);
+ pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingOnHandlerDisabledBitmap);
}
}
else if (checkStatus == _CHECK_BUTTON_STATUS_PRESSED)
{
- Bitmap* pOnOffSlidingOnPressedBitmap = __pCheckButton->GetOnOffSlidingOnBgBitmap(_CHECK_BUTTON_STATUS_PRESSED);
+ Bitmap* pOnOffSlidingPressedBgBitmap = __pCheckButton->GetOnOffSlidingBgBitmap(_CHECK_BUTTON_STATUS_PRESSED);
- if (pOnOffSlidingOnPressedBitmap)
+ if (pOnOffSlidingPressedBgBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingOnPressedBitmap);
+ pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingPressedBgBitmap);
}
- Bitmap* pOnOffSlidingHandlerPressedBitmap = __pCheckButton->GetOnOffSlidingHandlerBitmap(_CHECK_BUTTON_STATUS_PRESSED);
+ Bitmap* pOnOffSlidingOnHandlerPressedBitmap = __pCheckButton->GetOnOffSlidingOnHandlerBitmap(_CHECK_BUTTON_STATUS_PRESSED);
- if (pOnOffSlidingHandlerPressedBitmap)
+ if (pOnOffSlidingOnHandlerPressedBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingHandlerPressedBitmap);
+ pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingOnHandlerPressedBitmap);
}
}
else if (checkStatus == _CHECK_BUTTON_STATUS_HIGHLIGHTED)
{
- Bitmap* pOnOffSlidingOnHighlightedBitmap = __pCheckButton->GetOnOffSlidingOnBgBitmap(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
+ Bitmap* pOnOffSlidingHighlightedBgBitmap = __pCheckButton->GetOnOffSlidingBgBitmap(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
- if (pOnOffSlidingOnHighlightedBitmap)
+ if (pOnOffSlidingHighlightedBgBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingOnHighlightedBitmap);
+ pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingHighlightedBgBitmap);
}
- Bitmap* pOnOffSlidingHandlerNormalBitmap = __pCheckButton->GetOnOffSlidingHandlerBitmap(_CHECK_BUTTON_STATUS_NORMAL);
+ Bitmap* pOnOffSlidingOnHandlerNormalBitmap = __pCheckButton->GetOnOffSlidingOnHandlerBitmap(_CHECK_BUTTON_STATUS_NORMAL);
- if (pOnOffSlidingHandlerNormalBitmap)
+ if (pOnOffSlidingOnHandlerNormalBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingHandlerNormalBitmap);
+ pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingOnHandlerNormalBitmap);
}
- Bitmap* pOnOffSlidingHandlerHighlightedBitmap = __pCheckButton->GetOnOffSlidingHandlerBitmap(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
+ Bitmap* pOnOffSlidingOnHandlerHighlightedBitmap = __pCheckButton->GetOnOffSlidingOnHandlerBitmap(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
- if (pOnOffSlidingHandlerHighlightedBitmap)
+ if (pOnOffSlidingOnHandlerHighlightedBitmap)
{
- pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pOnOffSlidingHandlerHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA),
+ pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pOnOffSlidingOnHandlerHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA),
detailedHighlightedBackgroundColor);
}
}
else if (checkStatus == _CHECK_BUTTON_STATUS_SELECTED)
{
- Bitmap* pOnOffSlidingOnSelectedBitmap = __pCheckButton->GetOnOffSlidingOnBgBitmap(_CHECK_BUTTON_STATUS_SELECTED);
+ Bitmap* pOnOffSlidingSelectedBgBitmap = __pCheckButton->GetOnOffSlidingBgBitmap(_CHECK_BUTTON_STATUS_SELECTED);
- if (pOnOffSlidingOnSelectedBitmap)
+ if (pOnOffSlidingSelectedBgBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingOnSelectedBitmap);
+ pCanvas->DrawBitmap(FloatPoint(__onOffSlidingButtonBounds.x, __onOffSlidingButtonBounds.y), *pOnOffSlidingSelectedBgBitmap);
}
- Bitmap* pOnOffSlidingHandlerSelectedBitmap = __pCheckButton->GetOnOffSlidingHandlerBitmap(_CHECK_BUTTON_STATUS_SELECTED);
+ Bitmap* pOnOffSlidingOnHandlerSelectedBitmap = __pCheckButton->GetOnOffSlidingOnHandlerBitmap(_CHECK_BUTTON_STATUS_SELECTED);
- if (pOnOffSlidingHandlerSelectedBitmap)
+ if (pOnOffSlidingOnHandlerSelectedBitmap)
{
- pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingHandlerSelectedBitmap);
+ pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingOnHandlerSelectedBitmap);
}
}
}
_Button* pButton = ConvertFooterItem(item);
- if (__style == FOOTER_STYLE_SEGMENTED_TEXT || __style == FOOTER_STYLE_SEGMENTED_ICON || __style == FOOTER_STYLE_SEGMENTED_ICON_TEXT || __style == FOOTER_STYLE_TAB)
+ if (__style == FOOTER_STYLE_SEGMENTED_TEXT || __style == FOOTER_STYLE_SEGMENTED_ICON || __style == FOOTER_STYLE_SEGMENTED_ICON_TEXT
+ || __style == FOOTER_STYLE_TAB || __style == FOOTER_STYLE_TAB_LARGE)
{
pButton->SetButtonStyle(_BUTTON_STYLE_SEGMENT);
}
_Button* pButton = ConvertFooterItem(item);
- if (__style == FOOTER_STYLE_SEGMENTED_TEXT || __style == FOOTER_STYLE_SEGMENTED_ICON || __style == FOOTER_STYLE_SEGMENTED_ICON_TEXT || __style == FOOTER_STYLE_TAB)
+ if (__style == FOOTER_STYLE_SEGMENTED_TEXT || __style == FOOTER_STYLE_SEGMENTED_ICON || __style == FOOTER_STYLE_SEGMENTED_ICON_TEXT
+ || __style == FOOTER_STYLE_TAB || __style == FOOTER_STYLE_TAB_LARGE)
{
pButton->SetButtonStyle(_BUTTON_STYLE_SEGMENT);
}
result
_FooterImpl::SetButton(ButtonPosition position, const ButtonItem& button)
{
- SysTryReturnResult(NID_UI_CTRL, __style != FOOTER_STYLE_TAB,
+ SysTryReturnResult(NID_UI_CTRL, !(__style == FOOTER_STYLE_TAB || __style == FOOTER_STYLE_TAB_LARGE),
E_UNSUPPORTED_OPERATION, "[E_UNSUPPORTED_OPERATION] Unable to set the button item because the current style does not support it.");
SysTryReturnResult(NID_UI_CTRL, (button.GetActionId() >= FOOTER_ACTION_ID_MIN && button.GetActionId() <= FOOTER_ACTION_ID_MAX),
SysTryReturnResult(NID_UI_CTRL, 0, E_UNSUPPORTED_OPERATION, "[E_UNSUPPORTED_OPERATION] HW BackButton exist");
}
- SysTryReturnResult(NID_UI_CTRL, (__style != FOOTER_STYLE_TAB), E_UNSUPPORTED_OPERATION,
+ SysTryReturnResult(NID_UI_CTRL, !(__style == FOOTER_STYLE_TAB || __style == FOOTER_STYLE_TAB_LARGE), E_UNSUPPORTED_OPERATION,
"[E_UNSUPPORTED_OPERATION] The current Footer style does not support the operation.");
if ((__style == FOOTER_STYLE_SEGMENTED_TEXT || __style == FOOTER_STYLE_SEGMENTED_ICON || __style == FOOTER_STYLE_SEGMENTED_ICON_TEXT) && GetItemCount() > 4)
_Button* pButton = ConvertFooterItem(item);
- if (__style == FOOTER_STYLE_SEGMENTED_TEXT || __style == FOOTER_STYLE_SEGMENTED_ICON || __style == FOOTER_STYLE_SEGMENTED_ICON_TEXT || __style == FOOTER_STYLE_TAB)
+ if (__style == FOOTER_STYLE_SEGMENTED_TEXT || __style == FOOTER_STYLE_SEGMENTED_ICON || __style == FOOTER_STYLE_SEGMENTED_ICON_TEXT
+ || __style == FOOTER_STYLE_TAB || __style == FOOTER_STYLE_TAB_LARGE)
{
pButton->SetButtonStyle(_BUTTON_STYLE_SEGMENT);
}
SysTryReturnResult(NID_UI_CTRL, (itemIndex >= 0 && itemIndex < count), E_OUT_OF_RANGE,
"[E_OUT_OF_RANGE] The itemIndex is out of range.");
- if (__style == FOOTER_STYLE_SEGMENTED_TEXT || __style == FOOTER_STYLE_SEGMENTED_ICON || __style == FOOTER_STYLE_SEGMENTED_ICON_TEXT || __style == FOOTER_STYLE_TAB)
+ if (__style == FOOTER_STYLE_SEGMENTED_TEXT || __style == FOOTER_STYLE_SEGMENTED_ICON || __style == FOOTER_STYLE_SEGMENTED_ICON_TEXT
+ || __style == FOOTER_STYLE_TAB || __style == FOOTER_STYLE_TAB_LARGE)
{
// Selected item cannot be disabled.
int selectedItemIndex = GetSelectedItemIndex();
result
_FooterImpl::SetTabEditModeEnabled(bool enable)
{
- SysTryReturnResult(NID_UI_CTRL, (__style == FOOTER_STYLE_TAB), E_UNSUPPORTED_OPERATION,
- "[E_UNSUPPORTED_OPERATION] This operation is only for FOOTER_STYLE_TAB.");
+ SysTryReturnResult(NID_UI_CTRL, (__style == FOOTER_STYLE_TAB || __style == FOOTER_STYLE_TAB_LARGE), E_UNSUPPORTED_OPERATION,
+ "[E_UNSUPPORTED_OPERATION] This operation is only for FOOTER_STYLE_TAB or FOOTER_STYLE_TAB_LARGE");
return GetCore().SetTabEditModeEnabled(enable);
}
}
}
}
- else if (__style == FOOTER_STYLE_TAB)
+ else if (__style == FOOTER_STYLE_TAB || __style == FOOTER_STYLE_TAB_LARGE)
{
SysTryReturnResult(NID_UI_CTRL, (count < 15), E_MAX_EXCEEDED,
"[E_MAX_EXCEEDED] The number of items have exceeded the maximum limit.");
bool customTheme = false;
if (__style == FOOTER_STYLE_SEGMENTED_TEXT || __style == FOOTER_STYLE_SEGMENTED_ICON
- || __style == FOOTER_STYLE_SEGMENTED_ICON_TEXT || __style == FOOTER_STYLE_TAB)
+ || __style == FOOTER_STYLE_SEGMENTED_ICON_TEXT || __style == FOOTER_STYLE_TAB || __style == FOOTER_STYLE_TAB_LARGE)
{
r = GET_SHAPE_CONFIG(FOOTER::SEGMENTED_ITEM_FONT_SIZE, GetCore().GetOrientation(), fontSize);
customTheme = IS_CUSTOM_BITMAP(FOOTER::SEGMENTED_ITEM_BG_SELECTED);
}
}
- else if (__style == FOOTER_STYLE_TAB)
+ else if (__style == FOOTER_STYLE_TAB || __style == FOOTER_STYLE_TAB_LARGE)
{
if (GetCore().IsTransparent() == true)
{
if (pColorReplacedBitmap && customTheme == false)
{
- pButton->SetUnderlineBitmap(*pColorReplacedBitmap, false);
+ pButton->SetUnderlineBitmap(*pColorReplacedBitmap);
}
delete pColorReplacedBitmap;
case FOOTER_STYLE_BUTTON_ICON_TEXT:
viewStyle = TOOLBAR_ICON_TEXT;
+ break;
+
+ case FOOTER_STYLE_TAB_LARGE:
+ viewStyle = TOOLBAR_TAB_LARGE;
+ break;
default:
break;
SysTryReturnResult(NID_UI_CTRL, 0, E_UNSUPPORTED_OPERATION, "[E_UNSUPPORTED_OPERATION] HW MenuButton exist");
}
- SysTryReturnResult(NID_UI_CTRL, (__style != FOOTER_STYLE_TAB), E_UNSUPPORTED_OPERATION,
+ SysTryReturnResult(NID_UI_CTRL, !(__style == FOOTER_STYLE_TAB || __style == FOOTER_STYLE_TAB_LARGE), E_UNSUPPORTED_OPERATION,
"[E_UNSUPPORTED_OPERATION] The current Footer style does not support the operation.");
if (GetItemCount() > 3)
{
fstyle = FOOTER_STYLE_TAB;
}
+ else if (elementString.Equals(L"FOOTER_STYLE_TAB_LARGE", false))
+ {
+ fstyle = FOOTER_STYLE_TAB_LARGE;
+ }
pFooter->SetStyle(fstyle);
}
pFooter->SetItemTextColor(FOOTER_ITEM_STATUS_DISABLED, color);
}
- if ((FOOTER_STYLE_TAB != fstyle) && (pControl->GetElement(L"showBackButton", elementString)))
+ if (!(FOOTER_STYLE_TAB == fstyle || FOOTER_STYLE_TAB_LARGE == fstyle) && (pControl->GetElement(L"showBackButton", elementString)))
{
if (elementString.Equals(L"true", false))
{
}
}
- if ((FOOTER_STYLE_TAB != fstyle) && (pControl->GetElement(L"showMenuButton", elementString)))
+ if (!(FOOTER_STYLE_TAB == fstyle || FOOTER_STYLE_TAB_LARGE == fstyle) && (pControl->GetElement(L"showMenuButton", elementString)))
{
if (elementString.Equals(L"true", false))
{
_Button* pButton = ConvertHeaderItem(item);
if (__style == HEADER_STYLE_SEGMENTED || __style == HEADER_STYLE_SEGMENTED_WITH_TITLE
- || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE)
+ || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_TAB_LARGE)
{
pButton->SetButtonStyle(_BUTTON_STYLE_SEGMENT);
}
_HeaderImpl::GetSelectedItemIndex(void) const
{
SysTryReturn(NID_UI_CTRL, (__style == HEADER_STYLE_SEGMENTED || __style == HEADER_STYLE_SEGMENTED_WITH_TITLE
- || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE), -1,
+ || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_TAB_LARGE), -1,
E_UNSUPPORTED_OPERATION, "[E_UNSUPPORTED_OPERATION] Unable to get the selected item index because the current style does not support it.")
return GetCore().GetSelectedItemIndex();
}
SysTryReturnResult(NID_UI_CTRL, (__style == HEADER_STYLE_SEGMENTED || __style == HEADER_STYLE_SEGMENTED_WITH_TITLE
- || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_BUTTON), E_SYSTEM,
+ || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_TAB_LARGE
+ || __style == HEADER_STYLE_BUTTON), E_SYSTEM,
"[E_SYSTEM] Unable to add the item because the current style does not support it.");
int count = GetItemCount();
_Button* pButton = ConvertHeaderItem(item);
if (__style == HEADER_STYLE_SEGMENTED || __style == HEADER_STYLE_SEGMENTED_WITH_TITLE
- || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE)
+ || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_TAB_LARGE)
{
pButton->SetButtonStyle(_BUTTON_STYLE_SEGMENT);
}
result
_HeaderImpl::PlayWaitingAnimation(HeaderAnimationPosition animationPos)
{
- if ((__style == HEADER_STYLE_SEGMENTED || __style == HEADER_STYLE_TITLE_BUTTON || __style == HEADER_STYLE_BUTTON || __style == HEADER_STYLE_TAB)
+ if ((__style == HEADER_STYLE_SEGMENTED || __style == HEADER_STYLE_TITLE_BUTTON || __style == HEADER_STYLE_BUTTON
+ || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_LARGE)
&& animationPos == HEADER_ANIMATION_POSITION_TITLE)
{
SysLogException(NID_UI_CTRL, E_INVALID_OPERATION, "[E_INVALID_OPERATION] Unable to pause the waiting animation because the current style does not support it.");
result
_HeaderImpl::StopWaitingAnimation(HeaderAnimationPosition animationPos)
{
- if ((__style == HEADER_STYLE_SEGMENTED || __style == HEADER_STYLE_TITLE_BUTTON || __style == HEADER_STYLE_BUTTON || __style == HEADER_STYLE_TAB)
+ if ((__style == HEADER_STYLE_SEGMENTED || __style == HEADER_STYLE_TITLE_BUTTON || __style == HEADER_STYLE_BUTTON
+ || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_LARGE)
&& animationPos == HEADER_ANIMATION_POSITION_TITLE)
{
SysLogException(NID_UI_CTRL, E_INVALID_OPERATION, "[E_INVALID_OPERATION] A Header in this style doesn't support title animation.");
result
_HeaderImpl::PauseWaitingAnimation(HeaderAnimationPosition animationPos)
{
- if ((__style == HEADER_STYLE_SEGMENTED || __style == HEADER_STYLE_TITLE_BUTTON || __style == HEADER_STYLE_BUTTON || __style == HEADER_STYLE_TAB)
+ if ((__style == HEADER_STYLE_SEGMENTED || __style == HEADER_STYLE_TITLE_BUTTON || __style == HEADER_STYLE_BUTTON
+ || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_LARGE)
&& animationPos == HEADER_ANIMATION_POSITION_TITLE)
{
SysLogException(NID_UI_CTRL, E_INVALID_OPERATION, "[E_INVALID_OPERATION] Unable to pause the waiting animation because the current style does not support it.");
result
_HeaderImpl::SetButton(ButtonPosition position, const ButtonItem& button)
{
- SysTryReturnResult(NID_UI_CTRL, (!(__style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE)), E_INVALID_OPERATION,
+ SysTryReturnResult(NID_UI_CTRL, (!(__style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_TAB_LARGE)), E_INVALID_OPERATION,
"[E_INVALID_OPERATION] This operation is not supported.");
SysTryReturnResult(NID_UI_CTRL, (button.GetActionId() >= HEADER_ACTION_ID_MIN && button.GetActionId() <= HEADER_ACTION_ID_MAX),
_Button* pButton = ConvertHeaderItem(item);
if (__style == HEADER_STYLE_SEGMENTED || __style == HEADER_STYLE_SEGMENTED_WITH_TITLE
- || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE)
+ || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_TAB_LARGE)
{
pButton->SetButtonStyle(_BUTTON_STYLE_SEGMENT);
}
// Selected item cannot be disabled.
int selectedItemIndex = GetSelectedItemIndex();
- if (__style == HEADER_STYLE_SEGMENTED || __style == HEADER_STYLE_SEGMENTED_WITH_TITLE || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE)
+ if (__style == HEADER_STYLE_SEGMENTED || __style == HEADER_STYLE_SEGMENTED_WITH_TITLE
+ || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_TAB_LARGE)
{
if ((selectedItemIndex == itemIndex && enable == false) || (selectedItemIndex == -1 && itemIndex == 0 && enable == false))
{
_HeaderImpl::SetItemSelected(int itemIndex)
{
SysTryReturnResult(NID_UI_CTRL, (__style == HEADER_STYLE_SEGMENTED || __style == HEADER_STYLE_SEGMENTED_WITH_TITLE
- || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE),
+ || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_TAB_LARGE),
E_UNSUPPORTED_OPERATION, "[E_UNSUPPORTED_OPERATION] Unable to select the item because the current style does not support it.");
int count = GetItemCount();
result
_HeaderImpl::SetTabEditModeEnabled(bool enable)
{
- SysTryReturnResult(NID_UI_CTRL, (__style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE), E_UNSUPPORTED_OPERATION,
- "[E_UNSUPPORTED_OPERATION] This operation is only for HEADER_STYLE_TAB or HEADER_STYLE_TAB_WITH_TITLE");
+ SysTryReturnResult(NID_UI_CTRL, (__style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_TAB_LARGE), E_UNSUPPORTED_OPERATION,
+ "[E_UNSUPPORTED_OPERATION] This operation is only for HEADER_STYLE_TAB, HEADER_STYLE_TAB_WITH_TITLE or HEADER_STYLE_TAB_LARGE");
return GetCore().SetTabEditModeEnabled(enable);
}
int count = GetItemCount();
- if (__style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE)
+ if (__style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_TAB_LARGE)
{
SysTryReturnResult(NID_UI_CTRL, (count < HEADER_TAB_STYLE_MAX_ITEM_COUNT), E_MAX_EXCEEDED,
"[E_MAX_EXCEEDED] The number of items have exceeded the maximum limit.");
{
viewStyle = TOOLBAR_TEXT;
}
+ else if (style == HEADER_STYLE_TAB_LARGE)
+ {
+ viewStyle = TOOLBAR_TAB_LARGE;
+ }
return viewStyle;
}
{
r = GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE, GetCore().GetOrientation(), fontSize);
}
- else if (__style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE)
+ else if (__style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_TAB_LARGE)
{
r = GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE, GetCore().GetOrientation(), fontSize);
}
float iconSize = 0.0f;
if (__style == HEADER_STYLE_SEGMENTED || __style == HEADER_STYLE_SEGMENTED_WITH_TITLE
- || __style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_TAB)
+ || __style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_LARGE)
{
if (headerItem.GetText() != L"")
{
customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_BG_SELECTED);
}
}
- else if (__style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_TAB)
+ else if (__style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_LARGE)
{
if (GetCore().IsTransparent() == true)
{
{
if (__style == HEADER_STYLE_SEGMENTED_WITH_TITLE || __style == HEADER_STYLE_TAB_WITH_TITLE)
{
- pButton->SetUnderlineBitmap(*pColorReplacedBitmap, true);
+ pButton->SetUnderlineBitmap(*pColorReplacedBitmap);
}
else
{
- pButton->SetUnderlineBitmap(*pColorReplacedBitmap, false);
+ pButton->SetUnderlineBitmap(*pColorReplacedBitmap);
}
}
{
hstyle = HEADER_STYLE_BUTTON;
}
+ else if (elementString.Equals(L"HEADER_STYLE_TAB_LARGE", false))
+ {
+ hstyle = HEADER_STYLE_TAB_LARGE;
+ }
pHeader->SetStyle(hstyle);
}
}
if (hstyle == HEADER_STYLE_SEGMENTED || hstyle == HEADER_STYLE_SEGMENTED_WITH_TITLE
- || hstyle == HEADER_STYLE_TAB || hstyle == HEADER_STYLE_TAB_WITH_TITLE)
+ || hstyle == HEADER_STYLE_TAB || hstyle == HEADER_STYLE_TAB_WITH_TITLE || hstyle == HEADER_STYLE_TAB_LARGE)
{
// selected item
if (pControl->GetElement(L"selectedItemColorOpacity", elementString))
GET_COLOR_CONFIG(HEADER::BUTTON_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED, __itemTransTextColor[_BUTTON_STATUS_HIGHLIGHTED]);
//GET_COLOR_CONFIG(FOOTER::BUTTON_ITEM_TRANSLUCENT_TEXT_SELECTED, __itemTransTextColor[_BUTTON_STATUS_SELECTED]);
}
- else if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ else if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
GET_COLOR_CONFIG(HEADER::TAB_ITEM_TRANSLUCENT_BG_NORMAL, __itemTransBackgroundColor[_BUTTON_STATUS_NORMAL]);
GET_COLOR_CONFIG(HEADER::TAB_ITEM_TRANSLUCENT_BG_DISABLED, __itemTransBackgroundColor[_BUTTON_STATUS_DISABLED]);
// GET_COLOR_CONFIG(FOOTER::BUTTON_ITEM_TEXT_SELECTED, __itemTextColor[_BUTTON_STATUS_SELECTED]);
//}
}
- else if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE) // header
+ else if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE) // header
{
if (!__isItemBgColorSetByUser[_BUTTON_STATUS_NORMAL])
{
GET_COLOR_CONFIG(FOOTER::BUTTON_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED, __itemTransTextColor[_BUTTON_STATUS_HIGHLIGHTED]);
//GET_COLOR_CONFIG(FOOTER::BUTTON_ITEM_TRANSLUCENT_TEXT_SELECTED, __itemTransTextColor[_BUTTON_STATUS_SELECTED]);
}
- else if (__style == TOOLBAR_TAB)
+ else if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_LARGE)
{
GET_COLOR_CONFIG(FOOTER::TAB_ITEM_TRANSLUCENT_BG_NORMAL, __itemTransBackgroundColor[_BUTTON_STATUS_NORMAL]);
GET_COLOR_CONFIG(FOOTER::TAB_ITEM_TRANSLUCENT_BG_DISABLED, __itemTransBackgroundColor[_BUTTON_STATUS_DISABLED]);
// GET_COLOR_CONFIG(FOOTER::BUTTON_ITEM_TEXT_SELECTED, __itemTextColor[_BUTTON_STATUS_SELECTED]);
//}
}
- else if (__style == TOOLBAR_TAB)
+ else if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_LARGE)
{
if (!__isItemBgColorSetByUser[_BUTTON_STATUS_NORMAL])
{
__pToolbarPresenter->SetInitialDrawState(true);
- if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
SetTabEditModeEnabled(true);
}
GET_SHAPE_CONFIG(FOOTER::HEIGHT, GetOrientation(), height);
SetSize(FloatDimension(width, height));
}
+ else if (__style == TOOLBAR_TAB_LARGE)
+ {
+ //GET_SHAPE_CONFIG(HEADER::WIDTH, GetOrientation(), width);
+ GET_SHAPE_CONFIG(HEADER::TAB_LARGE_HEIGHT, GetOrientation(), height);
+ SetSize(FloatDimension(width, height));
+ }
else
{
//GET_SHAPE_CONFIG(HEADER::WIDTH, GetOrientation(), width);
{
GET_SHAPE_CONFIG(FOOTER::SOFTKEY_HEIGHT, GetOrientation(), height);
}
+ else if (__style == TOOLBAR_TAB_LARGE)
+ {
+ GET_SHAPE_CONFIG(FOOTER::TAB_LARGE_HEIGHT, GetOrientation(), height);
+ }
else
{
GET_SHAPE_CONFIG(FOOTER::HEIGHT, GetOrientation(), height);
break;
case TOOLBAR_TAB_WITH_TITLE:
//fall through
+ case TOOLBAR_TAB_LARGE:
+ //fall through
case TOOLBAR_TAB:
name = L"Tab" + Integer::ToString(__itemCount);
name.Append(L"Text");
pElement->SetTrait(trait);
if(style == TOOLBAR_HEADER_SEGMENTED || style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE
|| style == TOOLBAR_SEGMENTED || style == TOOLBAR_TAB_WITH_TITLE
- || style == TOOLBAR_TAB)
+ || style == TOOLBAR_TAB || __style == TOOLBAR_TAB_LARGE)
{
pElement->SetHintWithStringId("IDS_TPLATFORM_BODY_DOUBLE_TAP_TO_MOVE_TO_CONTENT_T_TTS");
pButton->GetAccessibilityContainer()->AddListener(*__pAccessibilityListener);
if (__itemCount != 0)
{
if (__style == TOOLBAR_HEADER_SEGMENTED || __style ==TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_SEGMENTED
- || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
__highlightedItemIndex = GetSelectedItemIndex();
}
if (__itemCount != 0)
{
if (__style == TOOLBAR_HEADER_SEGMENTED || __style ==TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_SEGMENTED
- || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
__highlightedItemIndex = GetSelectedItemIndex();
}
else // itemCount != 0
{
if (__style == TOOLBAR_HEADER_SEGMENTED || __style ==TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_SEGMENTED
- || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
__highlightedItemIndex = GetSelectedItemIndex();
if (__highlightedItemIndex - __pToolbarPresenter->GetFirstLoadedItemIndex() == SEGMENTED_ITEM_MAX)
{
- if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
__pToolbarPresenter->SetItemFit(__highlightedItemIndex - (SEGMENTED_ITEM_MAX - 1));
}
if (__highlightedItemIndex - __pToolbarPresenter->GetFirstLoadedItemIndex() == SEGMENTED_ITEM_MAX)
{
- if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
__pToolbarPresenter->SetItemFit(__highlightedItemIndex - (SEGMENTED_ITEM_MAX - 1));
}
if (__pToolbarPresenter->GetFirstLoadedItemIndex() > __highlightedItemIndex)
{
- if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
__pToolbarPresenter->SetItemFit(__highlightedItemIndex);
}
if (__pToolbarPresenter->GetFirstLoadedItemIndex() > __highlightedItemIndex)
{
- if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
__pToolbarPresenter->SetItemFit(__highlightedItemIndex);
}
if (__highlightedItemIndex < __itemCount)
{
if (__style == TOOLBAR_HEADER_SEGMENTED || __style ==TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_SEGMENTED
- || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
if (__pItems.at(__highlightedItemIndex)->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
{
if (__highlightedItemIndex < __itemCount)
{
if (__style == TOOLBAR_HEADER_SEGMENTED || __style ==TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_SEGMENTED
- || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
if (__pItems.at(__highlightedItemIndex)->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
{
if (__highlightedItemIndex < __itemCount)
{
if (__style == TOOLBAR_HEADER_SEGMENTED || __style ==TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_SEGMENTED
- || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
if (__pItems.at(__highlightedItemIndex)->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
{
if (__highlightedItemIndex < __itemCount)
{
if (__style == TOOLBAR_HEADER_SEGMENTED || __style ==TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_SEGMENTED
- || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
if (__pItems.at(__highlightedItemIndex)->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
{
}
}
}
- else if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ else if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
if (__header == true)
{
}
}
else if (__style == TOOLBAR_HEADER_SEGMENTED || __style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE
- || __style == TOOLBAR_SEGMENTED || __style == TOOLBAR_TITLE || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ || __style == TOOLBAR_SEGMENTED || __style == TOOLBAR_TITLE || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
if (pPressedBackgroundEffectBitmap)
{
{
GET_SHAPE_CONFIG(FOOTER::ITEM_MINIMUM_WIDTH, GetOrientation(), itemMinimumWidth);
- if ((__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE) && __itemCount > 4)
+ if ((__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE) && __itemCount > 4)
{
totalWidth += itemMinimumWidth * 4;
}
{
GET_SHAPE_CONFIG(FOOTER::ITEM_MINIMUM_WIDTH, GetOrientation(), itemMinimumWidth);
- if ((__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE) && __itemCount > 4)
+ if ((__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE) && __itemCount > 4)
{
totalWidth += itemMinimumWidth * 4;
}
GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_SIDE_MARGIN, GetOrientation(), sideMargin);
GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_TEXT_TOP_MARGIN, GetOrientation(), buttonTextTopMargin);
}
- else if (__style == TOOLBAR_HEADER_SEGMENTED || __style == TOOLBAR_SEGMENTED || __style == TOOLBAR_TAB)
+ else if (__style == TOOLBAR_HEADER_SEGMENTED || __style == TOOLBAR_SEGMENTED || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_LARGE)
{
GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_TEXT_LEFT_MARGIN, GetOrientation(), sideMargin);
{
if (__pButtonItems[RIGHT_BUTTON]->GetText() == L"")
{
- __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - headerRightMargin + rightTouchMargin, vmargin,
+ __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth + rightTouchMargin, vmargin,
headerRightButtonWidth, headerButtonItemHeight));
- __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - headerLeftButtonWidth - headerRightMargin + rightTouchMargin, vmargin,
+ __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - buttonItemGap - headerLeftButtonWidth + rightTouchMargin, vmargin,
headerLeftButtonWidth, headerButtonItemHeight));
if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE)
__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, 0.0f, rightTouchMargin, 0.0f);
__pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, 0.0f, rightTouchMargin, 0.0f);
- __itemArea.width -= (headerLeftButtonWidth + headerRightButtonWidth + headerLeftMargin - leftTouchMargin * 2);
+ __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth - leftTouchMargin * 2);
}
else
{
__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
__pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
- __titleTextArea.width -= (headerLeftButtonWidth + headerRightButtonWidth + headerLeftMargin - leftTouchMargin * 2);
- __itemArea.width -= (headerLeftButtonWidth + headerRightButtonWidth + headerLeftMargin - leftTouchMargin * 2);
+ __titleTextArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth - leftTouchMargin * 2);
+ __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth - leftTouchMargin * 2);
}
}
else
{
- __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - headerRightMargin, vmargin,
+ __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth , vmargin,
headerRightButtonWidth, headerButtonItemHeight));
- __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - headerLeftButtonWidth - headerRightMargin, vmargin,
+ __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - buttonItemGap - headerLeftButtonWidth , vmargin,
headerLeftButtonWidth, headerButtonItemHeight));
if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE)
//__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(0, 0, 0, 0);
__pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, 0.0f, rightTouchMargin, 0.0f);
- __itemArea.width -= (headerLeftButtonWidth + headerRightButtonWidth + headerLeftMargin - leftTouchMargin);
+ __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth - leftTouchMargin);
}
else
{
__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
__pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
- __titleTextArea.width -= (headerLeftButtonWidth + headerRightButtonWidth + headerLeftMargin - leftTouchMargin);
- __itemArea.width -= (headerLeftButtonWidth + headerRightButtonWidth + headerLeftMargin - leftTouchMargin);
+ __titleTextArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth - leftTouchMargin);
+ __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth - leftTouchMargin);
}
}
}
{
if (__pButtonItems[RIGHT_BUTTON]->GetText() == L"")
{
- __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - headerRightMargin + rightTouchMargin, vmargin,
+ __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth + rightTouchMargin, vmargin,
headerRightButtonWidth, headerButtonItemHeight));
- __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - headerLeftButtonWidth - headerRightMargin + rightTouchMargin, vmargin,
+ __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - buttonItemGap - headerLeftButtonWidth + rightTouchMargin, vmargin,
headerLeftButtonWidth, headerButtonItemHeight));
if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE)
//__pButtonItems[LEFT_BUTTON]->SetTouchMargin(0, 0, 0, 0);
__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, 0.0f, rightTouchMargin, 0.0f);
- __itemArea.width -= (headerLeftButtonWidth + headerRightButtonWidth + headerLeftMargin - leftTouchMargin);
+ __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth - leftTouchMargin);
}
else
{
__pButtonItems[LEFT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
- __titleTextArea.width -= (headerLeftButtonWidth + headerRightButtonWidth + headerLeftMargin - leftTouchMargin);
- __itemArea.width -= (headerLeftButtonWidth + headerRightButtonWidth + headerLeftMargin - leftTouchMargin);
+ __titleTextArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth - leftTouchMargin);
+ __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth - leftTouchMargin);
}
}
else
{
- __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - headerRightMargin, vmargin,
+ __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth , vmargin,
headerRightButtonWidth, headerButtonItemHeight));
- __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - headerLeftButtonWidth - buttonItemGap - headerRightMargin, vmargin,
+ __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - buttonItemGap - headerLeftButtonWidth , vmargin,
headerLeftButtonWidth, headerButtonItemHeight));
if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE)
//__pButtonItems[LEFT_BUTTON]->SetTouchMargin(0, 0, 0, 0);
//__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(0, 0, 0, 0);
- __itemArea.width -= (headerLeftButtonWidth + headerRightButtonWidth + buttonItemGap + headerLeftMargin);
+ __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
}
else
{
__pButtonItems[LEFT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
- __titleTextArea.width -= (headerLeftButtonWidth + headerRightButtonWidth + buttonItemGap + headerLeftMargin);
- __itemArea.width -= (headerLeftButtonWidth + headerRightButtonWidth + buttonItemGap + headerLeftMargin);
+ __titleTextArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
+ __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
}
}
}
{
if (__pButtonItems[RIGHT_BUTTON]->GetText() == L"")
{
- __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - headerRightMargin + rightTouchMargin, vmargin,
+ __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth + rightTouchMargin, vmargin,
headerRightButtonWidth, headerButtonItemHeight));
if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE)
{
__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, 0.0f, rightTouchMargin, 0.0f);
- __itemArea.width -= (headerRightButtonWidth + headerLeftMargin - leftTouchMargin - rightTouchMargin);
+ __itemArea.width -= (headerRightButtonWidth - leftTouchMargin - rightTouchMargin);
}
else
{
__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
- __titleTextArea.width -= (headerRightButtonWidth + headerLeftMargin - leftTouchMargin - rightTouchMargin);
- __itemArea.width -= (headerRightButtonWidth + headerLeftMargin - leftTouchMargin - rightTouchMargin);
+ __titleTextArea.width -= (headerRightButtonWidth - leftTouchMargin - rightTouchMargin);
+ __itemArea.width -= (headerRightButtonWidth - leftTouchMargin - rightTouchMargin);
}
}
else
{
- __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - headerRightMargin, vmargin,
+ __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth , vmargin,
headerRightButtonWidth, headerButtonItemHeight));
if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE)
{
//__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(0, 0, 0, 0);
- __itemArea.width -= (headerRightButtonWidth + headerLeftMargin);
+ __itemArea.width -= (headerRightButtonWidth);
}
else
{
__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
- __titleTextArea.width -= (headerRightButtonWidth + headerLeftMargin);
- __itemArea.width -= (headerRightButtonWidth + headerLeftMargin);
+ __titleTextArea.width -= (headerRightButtonWidth);
+ __itemArea.width -= (headerRightButtonWidth);
}
}
}
{
if (__pButtonItems[LEFT_BUTTON]->GetText() == L"")
{
- __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerLeftButtonWidth - headerRightMargin + rightTouchMargin, vmargin,
+ __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerLeftButtonWidth + rightTouchMargin, vmargin,
headerLeftButtonWidth, headerButtonItemHeight));
if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE)
{
__pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, 0.0f, rightTouchMargin, 0.0f);
- __itemArea.width -= (headerLeftButtonWidth + headerLeftMargin - leftTouchMargin - rightTouchMargin);
+ __itemArea.width -= (headerLeftButtonWidth - leftTouchMargin - rightTouchMargin);
}
else
{
__pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
- __titleTextArea.width -= (headerLeftButtonWidth + headerLeftMargin - leftTouchMargin - rightTouchMargin);
- __itemArea.width -= (headerLeftButtonWidth + headerLeftMargin - leftTouchMargin - rightTouchMargin);
+ __titleTextArea.width -= (headerLeftButtonWidth - leftTouchMargin - rightTouchMargin);
+ __itemArea.width -= (headerLeftButtonWidth - leftTouchMargin - rightTouchMargin);
}
}
else
{
- __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerLeftButtonWidth - headerRightMargin, vmargin,
+ __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerLeftButtonWidth , vmargin,
headerLeftButtonWidth, headerButtonItemHeight));
if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE)
{
//__pButtonItems[LEFT_BUTTON]->SetTouchMargin(0, 0, 0, 0);
- __itemArea.width -= (headerLeftButtonWidth + headerLeftMargin);
+ __itemArea.width -= (headerLeftButtonWidth);
}
else
{
__pButtonItems[LEFT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
- __titleTextArea.width -= (headerLeftButtonWidth + headerLeftMargin);
- __itemArea.width -= (headerLeftButtonWidth + headerLeftMargin);
+ __titleTextArea.width -= (headerLeftButtonWidth);
+ __itemArea.width -= (headerLeftButtonWidth);
}
}
}
__titleTextArea.width -= (headerLeftMargin + headerRightMargin);
__itemArea.width -= (headerLeftMargin + headerLeftMargin);
}
- else if (!(__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE))
+ else if (!(__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE))
{
__titleTextArea.width -= (headerLeftMargin + headerRightMargin);
__itemArea.width -= (headerLeftMargin + headerRightMargin);
case TOOLBAR_TAB:
//fall through
+ case TOOLBAR_TAB_LARGE:
+ //fall through
case TOOLBAR_TAB_WITH_TITLE:
RearrangeTabItmes();
break;
if (__itemCount == 1 || __itemCount == 2)
{
- blockWidth[0] = blockWidth[1] = (__itemArea.width - dividerWidth) / 2;
+ if (!(__pButtonItems[LEFT_BUTTON] || __pButtonItems[RIGHT_BUTTON])) // no button
+ {
+ blockWidth[0] = blockWidth[1] = (GetSizeF().width - dividerWidth ) / 2;
+ }
+ else
+ {
+ blockWidth[0] = blockWidth[1] = (__itemArea.width + leftMargin - dividerWidth) / 2;
+ }
for (int i = 0; i < __itemCount ; i++)
{
- __pItems.at(i)->SetBounds(FloatRectangle(leftMargin + blockWidth[0] * i + dividerWidth * i, vmargin, blockWidth[i], segmentedItemHeight));
+ __pItems.at(i)->SetBounds(FloatRectangle(blockWidth[0] * i + dividerWidth * i, vmargin, blockWidth[i], segmentedItemHeight));
if (__pItems.at(i)->GetChildCount() != 0)
{
}
else if (__itemCount == 3)
{
- blockWidth[0] = blockWidth[1] = blockWidth[2] = (__itemArea.width - dividerWidth * 2) / 3;
+ if (!(__pButtonItems[LEFT_BUTTON] || __pButtonItems[RIGHT_BUTTON])) // no button
+ {
+ blockWidth[0] = blockWidth[1] = blockWidth[2] = (GetSizeF().width - dividerWidth * 2) / 3;
- __pItems.at(0)->SetBounds(FloatRectangle(leftMargin, vmargin, blockWidth[0], segmentedItemHeight));
- __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + blockWidth[0] + dividerWidth, vmargin, blockWidth[1], segmentedItemHeight));
- __pItems.at(2)->SetBounds(FloatRectangle(leftMargin + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
- vmargin, blockWidth[2], segmentedItemHeight));
+ __pItems.at(0)->SetBounds(FloatRectangle(0, vmargin, blockWidth[0], segmentedItemHeight));
+ __pItems.at(1)->SetBounds(FloatRectangle(blockWidth[0] + dividerWidth, vmargin, blockWidth[1], segmentedItemHeight));
+ __pItems.at(2)->SetBounds(FloatRectangle(GetSizeF().width - blockWidth[2],vmargin, blockWidth[2], segmentedItemHeight));
+ }
+ else
+ {
+ blockWidth[0] = blockWidth[1] = blockWidth[2] = (__itemArea.width + leftMargin - dividerWidth * 2) / 3;
+
+ __pItems.at(0)->SetBounds(FloatRectangle(0, vmargin, blockWidth[0], segmentedItemHeight));
+ __pItems.at(1)->SetBounds(FloatRectangle(blockWidth[0] + dividerWidth, vmargin, blockWidth[1], segmentedItemHeight));
+ __pItems.at(2)->SetBounds(FloatRectangle(blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+ vmargin, blockWidth[2], segmentedItemHeight));
+ }
for (int i = 0; i < __itemCount; i++)
{
}
else if (__itemCount == 4)
{
- blockWidth[0] = blockWidth[1] = blockWidth[2] = blockWidth[3] = (__itemArea.width - dividerWidth * 3) / 4;
+ if (!(__pButtonItems[LEFT_BUTTON] || __pButtonItems[RIGHT_BUTTON])) // no button
+ {
+ blockWidth[0] = blockWidth[1] = blockWidth[2] = blockWidth[3] = (GetSizeF().width - dividerWidth * 3) / 4;
- __pItems.at(0)->SetBounds(FloatRectangle(leftMargin, vmargin, blockWidth[0], segmentedItemHeight));
- __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + blockWidth[0] + dividerWidth, vmargin, blockWidth[1], segmentedItemHeight));
- __pItems.at(2)->SetBounds(FloatRectangle(leftMargin + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
- vmargin, blockWidth[2], segmentedItemHeight));
- __pItems.at(3)->SetBounds(FloatRectangle(leftMargin + blockWidth[0] + blockWidth[1] + blockWidth[2] + dividerWidth * 3,
- vmargin, blockWidth[3], segmentedItemHeight));
+ __pItems.at(0)->SetBounds(FloatRectangle(0, vmargin, blockWidth[0], segmentedItemHeight));
+ __pItems.at(1)->SetBounds(FloatRectangle(blockWidth[0] + dividerWidth, vmargin, blockWidth[1], segmentedItemHeight));
+ __pItems.at(2)->SetBounds(FloatRectangle(blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+ vmargin, blockWidth[2], segmentedItemHeight));
+ __pItems.at(3)->SetBounds(FloatRectangle(blockWidth[0] + blockWidth[1] + blockWidth[2] + dividerWidth * 3,
+ vmargin, GetSizeF().width - (blockWidth[0] + blockWidth[1] + blockWidth[2] + dividerWidth * 3), segmentedItemHeight));
+ }
+ else
+ {
+ blockWidth[0] = blockWidth[1] = blockWidth[2] = blockWidth[3] = (__itemArea.width + leftMargin - dividerWidth * 3) / 4;
+
+ __pItems.at(0)->SetBounds(FloatRectangle(0, vmargin, blockWidth[0], segmentedItemHeight));
+ __pItems.at(1)->SetBounds(FloatRectangle(blockWidth[0] + dividerWidth, vmargin, blockWidth[1], segmentedItemHeight));
+ __pItems.at(2)->SetBounds(FloatRectangle(blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+ vmargin, blockWidth[2], segmentedItemHeight));
+ __pItems.at(3)->SetBounds(FloatRectangle(blockWidth[0] + blockWidth[1] + blockWidth[2] + dividerWidth * 3,
+ vmargin, blockWidth[3], segmentedItemHeight));
+ }
for (int i = 0; i < __itemCount ; i++)
{
GET_SHAPE_CONFIG(HEADER::TAB_LEFT_MARGIN, GetOrientation(), tabLeftMargin);
GET_SHAPE_CONFIG(HEADER::DIVIDER_WIDTH, GetOrientation(), dividerWidth);
- if (__style == TOOLBAR_TAB)
+ if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_LARGE)
{
segmentedItemHeight = __itemArea.height;
}
GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE, GetOrientation(), fontSize); // 30
- if (__style == TOOLBAR_TAB)
+ if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_LARGE)
{
GET_SHAPE_CONFIG(HEADER::TAB_ITEM_MULTILINE_FONT_SIZE, GetOrientation(), multilineFontSize); // 28
}
GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE, GetOrientation(), fontSize); // 30
- if (__style == TOOLBAR_TAB)
+ if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_LARGE)
{
GET_SHAPE_CONFIG(HEADER::TAB_ITEM_MULTILINE_FONT_SIZE, GetOrientation(), multilineFontSize); // 28
}
GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_3_ITEM, GetOrientation(), fontSize); // 26
- if (__style == TOOLBAR_TAB)
+ if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_LARGE)
{
GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_3_ITEM, GetOrientation(), multilineFontSize); // 26
}
float itemButtonLeftGap = 0.0f;
float itemButtonRightGap = 0.0f;
float tabLeftMargin = 0.0f;
- float sipFooterItemTopMargin = 0.0f;
float dividerWidth = 0.0f;
float iconSize = 0.0f;
float footerLeftMargin = 0.0f;
float fontSize = 0.0f;
float multilineFontSize = 0.0f;
- GET_SHAPE_CONFIG(HEADER::SIP_FOOTER_ITEM_TOP_MARGIN, GetOrientation(), sipFooterItemTopMargin);
GET_SHAPE_CONFIG(HEADER::DIVIDER_WIDTH, GetOrientation(), dividerWidth);
GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_ICON_SIZE, GetOrientation(), iconSize);
GET_SHAPE_CONFIG(FOOTER::LEFT_MARGIN, GetOrientation(), footerLeftMargin);
{
blockWidth[0] = __titleTextArea.width;
itemHeight = segmentedItemHeight;
- __pItems.at(0)->SetBounds(FloatRectangle(headerLeftMargin, topMargin, blockWidth[0], itemHeight));
+ __pItems.at(0)->SetBounds(FloatRectangle(headerLeftMargin, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
__pItems.at(0)->SetMargin(0.0f, 0.0f, 0.0f, 0.0f);
}
else
blockWidth[0] = __itemArea.width;
}
- if (__header == true && __style == TOOLBAR_TEXT && GetOrientation() == _CONTROL_ORIENTATION_PORTRAIT) // sip
- {
- __pItems.at(0)->SetBounds(FloatRectangle((GetSizeF().width - blockWidth[0]) / 2, sipFooterItemTopMargin, blockWidth[0], itemHeight));
- }
- else
- {
- __pItems.at(0)->SetBounds(FloatRectangle((GetSizeF().width - blockWidth[0]) / 2, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
- }
+ __pItems.at(0)->SetBounds(FloatRectangle((GetSizeF().width - blockWidth[0]) / 2, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
}
for (int i = 0; i < __itemCount; i++)
blockWidth[1] = blockWidth[0];
}
- if (__header == true && __style == TOOLBAR_TEXT && GetOrientation() == _CONTROL_ORIENTATION_PORTRAIT) // sip
- {
- __pItems.at(0)->SetBounds(FloatRectangle(GetSizeF().width / 2 - itemGap - blockWidth[0], sipFooterItemTopMargin, blockWidth[0], itemHeight));
- __pItems.at(1)->SetBounds(FloatRectangle(GetSizeF().width / 2 + itemGap, sipFooterItemTopMargin, blockWidth[1], itemHeight));
- }
- else
- {
- __pItems.at(0)->SetBounds(FloatRectangle(GetSizeF().width / 2 - itemGap - blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
- __pItems.at(1)->SetBounds(FloatRectangle(GetSizeF().width / 2 + itemGap, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
- }
+ __pItems.at(0)->SetBounds(FloatRectangle(GetSizeF().width / 2 - itemGap - blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+ __pItems.at(1)->SetBounds(FloatRectangle(GetSizeF().width / 2 + itemGap, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
for (int i = 0; i < __itemCount; i++)
{
blockWidth[0] = blockWidth[1] = blockWidth[2] = (__itemArea.width - dividerWidth * 2) / 3;
- if (__header == true && __style == TOOLBAR_TEXT && GetOrientation() == _CONTROL_ORIENTATION_PORTRAIT) // sip
- {
- __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, sipFooterItemTopMargin, blockWidth[0], itemHeight));
- __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, sipFooterItemTopMargin, blockWidth[1], itemHeight));
- __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
- sipFooterItemTopMargin, blockWidth[2], itemHeight));
- }
- else
- {
- __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
- __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
- __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
- (GetSizeF().height - itemHeight) / 2, blockWidth[2], itemHeight));
- }
+ __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+ __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+ __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+ (GetSizeF().height - itemHeight) / 2, blockWidth[2], itemHeight));
for (int i = 0; i < __itemCount; i++)
{
blockWidth[0] = blockWidth[1] = blockWidth[2] = blockWidth[3] = (__itemArea.width - dividerWidth * 3) / 4;
- if (__header == true && __style == TOOLBAR_TEXT && GetOrientation() == _CONTROL_ORIENTATION_PORTRAIT) // sip
- {
- __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin, sipFooterItemTopMargin, blockWidth[0], itemHeight));
- __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + dividerWidth, sipFooterItemTopMargin, blockWidth[1], itemHeight));
- __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
- sipFooterItemTopMargin, blockWidth[2], itemHeight));
- __pItems.at(3)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1] + blockWidth[2] + dividerWidth * 3,
- sipFooterItemTopMargin, blockWidth[3], itemHeight));
- }
- else
- {
- __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
- __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
- __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
- (GetSizeF().height - itemHeight) / 2, blockWidth[2], itemHeight));
- __pItems.at(3)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1] + blockWidth[2] + dividerWidth * 3,
- (GetSizeF().height - itemHeight) / 2, blockWidth[3], itemHeight));
- }
+ __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+ __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+ __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+ (GetSizeF().height - itemHeight) / 2, blockWidth[2], itemHeight));
+ __pItems.at(3)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1] + blockWidth[2] + dividerWidth * 3,
+ (GetSizeF().height - itemHeight) / 2, blockWidth[3], itemHeight));
for (int i = 0; i < __itemCount; i++)
{
blockWidth[0] = blockWidth[1] = blockWidth[2] = blockWidth[3] = blockWidth[4] = (__itemArea.width - dividerWidth * 4) / 5;
- if (__header == true && __style == TOOLBAR_TEXT && GetOrientation() == _CONTROL_ORIENTATION_PORTRAIT) // sip
- {
- __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin, sipFooterItemTopMargin, blockWidth[0], itemHeight));
- __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + dividerWidth, sipFooterItemTopMargin, blockWidth[1], itemHeight));
- __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
- sipFooterItemTopMargin, blockWidth[2], itemHeight));
- __pItems.at(3)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1] + blockWidth[2] + dividerWidth * 3,
- sipFooterItemTopMargin, blockWidth[3], itemHeight));
- __pItems.at(4)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1] + blockWidth[2] + blockWidth[3] + dividerWidth * 4,
- sipFooterItemTopMargin, blockWidth[4], itemHeight));
- }
- else
- {
- __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
- __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
- __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
- (GetSizeF().height - itemHeight) / 2, blockWidth[2], itemHeight));
- __pItems.at(3)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1] + blockWidth[2] + dividerWidth * 3,
- (GetSizeF().height - itemHeight) / 2, blockWidth[3], itemHeight));
- __pItems.at(4)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1] + blockWidth[2] + blockWidth[3] + dividerWidth * 4,
- (GetSizeF().height - itemHeight) / 2, blockWidth[4], itemHeight));
- }
+ __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+ __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+ __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+ (GetSizeF().height - itemHeight) / 2, blockWidth[2], itemHeight));
+ __pItems.at(3)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1] + blockWidth[2] + dividerWidth * 3,
+ (GetSizeF().height - itemHeight) / 2, blockWidth[3], itemHeight));
+ __pItems.at(4)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1] + blockWidth[2] + blockWidth[3] + dividerWidth * 4,
+ (GetSizeF().height - itemHeight) / 2, blockWidth[4], itemHeight));
for (int i = 0; i < __itemCount; i++)
{
}
}
}
- else if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ else if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
if (__header == true)
{
}
}
}
- else if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ else if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
if (__header == true)
{
}
}
}
- else if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ else if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
if (__header == true)
{
}
}
}
- else if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ else if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
if (__header == true)
{
}
}
}
- else if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+ else if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
{
if (__header == true)
{
float footerButtonItemHeight = 0.0f;
float fontSize = 0.0f;
- float rightMargin = 0.0f;
float dividerTopMargin = 0.0f;
float segmentedItemHeight = 0.0f;
GET_SHAPE_CONFIG(HEADER::DIVIDER_WIDTH, __pToolbar->GetOrientation(), buttonItemGap);
GET_SHAPE_CONFIG(HEADER::DIVIDER_HEIGHT, __pToolbar->GetOrientation(), dividerHeight);
- GET_SHAPE_CONFIG(HEADER::RIGHT_MARGIN, __pToolbar->GetOrientation(), rightMargin);
GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_HEIGHT, __pToolbar->GetOrientation(), segmentedItemHeight);
GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_WIDTH, __pToolbar->GetOrientation(), footerButtonItemWidth);
{
if (__pToolbar->GetButton(LEFT_BUTTON))
{
- if (__pToolbar->GetButton(LEFT_BUTTON)->GetText() != L"" && __pToolbar->GetButton(RIGHT_BUTTON)->GetText() != L"")
- {
- DrawDivider(FloatPoint(bounds.width - __pToolbar->GetButton(RIGHT_BUTTON)->GetBoundsF().width - buttonItemGap - rightMargin,
- dividerTopMargin + (dividerBaseHeight - dividerHeight) / 2), pCanvas);
- }
+ DrawDivider(FloatPoint(bounds.width - __pToolbar->GetButton(RIGHT_BUTTON)->GetBoundsF().width - buttonItemGap,
+ dividerTopMargin + (dividerBaseHeight - dividerHeight) / 2), pCanvas);
+
+ DrawDivider(FloatPoint(bounds.width - __pToolbar->GetButton(RIGHT_BUTTON)->GetBoundsF().width - buttonItemGap
+ - __pToolbar->GetButton(LEFT_BUTTON)->GetBoundsF().width - buttonItemGap,
+ dividerTopMargin + (dividerBaseHeight - dividerHeight) / 2), pCanvas);
+ }
+ else
+ {
+ DrawDivider(FloatPoint(bounds.width - __pToolbar->GetButton(RIGHT_BUTTON)->GetBoundsF().width - buttonItemGap,
+ dividerTopMargin + (dividerBaseHeight - dividerHeight) / 2), pCanvas);
+ }
+ }
+ else
+ {
+ if (__pToolbar->GetButton(LEFT_BUTTON))
+ {
+ DrawDivider(FloatPoint(bounds.width - __pToolbar->GetButton(LEFT_BUTTON)->GetBoundsF().width - buttonItemGap,
+ dividerTopMargin + (dividerBaseHeight - dividerHeight) / 2), pCanvas);
}
}
}
if (__initialDraw)
{
- if ((style == TOOLBAR_TAB || style == TOOLBAR_TAB_WITH_TITLE
+ if ((style == TOOLBAR_TAB || style == TOOLBAR_TAB_WITH_TITLE || style == TOOLBAR_TAB_LARGE
|| style == TOOLBAR_SEGMENTED || style == TOOLBAR_HEADER_SEGMENTED || style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
&& __pToolbar->GetItemCount() > 0 && __pToolbarModel->GetSelectedItemIndex() == -1)
{
{
ToolbarStyle style = __pToolbar->GetStyle();
- if ((style == TOOLBAR_TAB || style == TOOLBAR_TAB_WITH_TITLE) && __pToolbar->GetItemCount() > SEGMENTED_ITEM_MAX)
+ if ((style == TOOLBAR_TAB || style == TOOLBAR_TAB_WITH_TITLE || style == TOOLBAR_TAB_LARGE) && __pToolbar->GetItemCount() > SEGMENTED_ITEM_MAX)
{
if (itemIndex <= __pToolbar->GetItemCount() - SEGMENTED_ITEM_MAX)
{
GET_SHAPE_CONFIG(HEADER::TAB_LEFT_MARGIN, __pToolbar->GetOrientation(), tabLeftMargin);
- if ((style == TOOLBAR_TAB || style == TOOLBAR_TAB_WITH_TITLE) && __beingEdited == true)
+ if ((style == TOOLBAR_TAB || style == TOOLBAR_TAB_WITH_TITLE || style == TOOLBAR_TAB_LARGE) && __beingEdited == true)
{
__beingEdited = false;
}
else
{
- if ((style == TOOLBAR_TAB || style == TOOLBAR_TAB_WITH_TITLE) && __pToolbar->GetItemCount() > SEGMENTED_ITEM_MAX)
+ if ((style == TOOLBAR_TAB || style == TOOLBAR_TAB_WITH_TITLE || style == TOOLBAR_TAB_LARGE)
+ && __pToolbar->GetItemCount() > SEGMENTED_ITEM_MAX)
{
if (__pressedItemIndex != -1)
{
if (__pressedItemIndex != -1 && __initialPressesItemStatus != _BUTTON_STATUS_DISABLED)
{
if (style == TOOLBAR_HEADER_SEGMENTED || style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE
- || style == TOOLBAR_TAB || style == TOOLBAR_TAB_WITH_TITLE || style == TOOLBAR_SEGMENTED)
+ || style == TOOLBAR_TAB || style == TOOLBAR_TAB_WITH_TITLE || style == TOOLBAR_SEGMENTED || style == TOOLBAR_TAB_LARGE)
{
__pToolbar->SetItemSelected(releasedItemIndex, true, false);
}
FloatRectangle itemBounds = pCurrentButton->GetBoundsF();
- if ((style == TOOLBAR_TAB || style == TOOLBAR_TAB_WITH_TITLE) && __pToolbar->GetItemCount() > SEGMENTED_ITEM_MAX)
+ if ((style == TOOLBAR_TAB || style == TOOLBAR_TAB_WITH_TITLE || style == TOOLBAR_TAB_LARGE) && __pToolbar->GetItemCount() > SEGMENTED_ITEM_MAX)
{
if (itemBounds.Contains(touchPoint))
{
}
}
- if ((style == TOOLBAR_TAB || style == TOOLBAR_TAB_WITH_TITLE) && __beingEdited == true)
+ if ((style == TOOLBAR_TAB || style == TOOLBAR_TAB_WITH_TITLE || style == TOOLBAR_TAB_LARGE) && __beingEdited == true)
{
DrawEditItem(touchinfo.GetCurrentPosition());
}
{
ToolbarStyle style = __pToolbar->GetStyle();
- if (!(style == TOOLBAR_TAB || style == TOOLBAR_TAB_WITH_TITLE) || __pToolbar->GetItemCount() <= SEGMENTED_ITEM_MAX || __beingEdited == true || __tabMoved == false)
+ if (!(style == TOOLBAR_TAB || style == TOOLBAR_TAB_WITH_TITLE || style == TOOLBAR_TAB_LARGE) || __pToolbar->GetItemCount() <= SEGMENTED_ITEM_MAX || __beingEdited == true || __tabMoved == false)
{
return true;
}
result SetToolbarItemBackgroundBitmap(_ButtonStatus status, const Tizen::Graphics::Bitmap& bitmap);
Tizen::Graphics::Bitmap* GetToolbarItemBackgroundBitmap(_ButtonStatus status) const;
- result SetUnderlineBitmap(const Tizen::Graphics::Bitmap& bitmap, bool drawInner);
+ result SetUnderlineBitmap(const Tizen::Graphics::Bitmap& bitmap);
Tizen::Graphics::Bitmap* GetUnderlineBitmap(void) const;
result SetBackgroundBitmap(_ButtonStatus status, const Tizen::Graphics::Bitmap& bitmap);
Tizen::Graphics::FloatRectangle GetUserDefinedTextAreaF(void) const;
bool UserDefinedText(void) const;
- bool IsDrawInner(void) const;
result ShowUnderlineBitmap(bool show);
result SetMargin(int leftMargin, int topMargin, int rightMargin, int bottomMargin);
float __rightTouchMargin;
float __bottomTouchMargin;
- bool __drawInner;
-
Tizen::Graphics::FloatRectangle __userDefinedTextArea;
Tizen::Ui::_AccessibilityElement* __pTextElement;
Tizen::Graphics::Bitmap* GetOnOffBgBitmap(_CheckButtonStatus checkButtonStatus) const;
Tizen::Graphics::Bitmap* GetOnOffBitmap(_CheckButtonStatus checkButtonStatus) const;
- Tizen::Graphics::Bitmap* GetOnOffSlidingOnBgBitmap(_CheckButtonStatus checkButtonStatus) const;
- Tizen::Graphics::Bitmap* GetOnOffSlidingOffBgBitmap(_CheckButtonStatus checkButtonStatus) const;
- Tizen::Graphics::Bitmap* GetOnOffSlidingHandlerBitmap(_CheckButtonStatus checkButtonStatus) const;
+ Tizen::Graphics::Bitmap* GetOnOffSlidingBgBitmap(_CheckButtonStatus checkButtonStatus) const;
+ Tizen::Graphics::Bitmap* GetOnOffSlidingOnHandlerBitmap(_CheckButtonStatus checkButtonStatus) const;
+ Tizen::Graphics::Bitmap* GetOnOffSlidingOffHandlerBitmap(_CheckButtonStatus checkButtonStatus) const;
Tizen::Graphics::Bitmap* GetCircleBitmap(_CheckButtonStatus checkButtonStatus) const;
Tizen::Graphics::Bitmap* GetDetailedRightBitmap(_CheckButtonStatus checkButtonStatus) const;
Tizen::Graphics::Bitmap* __pOnOffBgNormalBitmap[NUMBER_OF_CHECK_BUTTON_STATUS];
Tizen::Graphics::Bitmap* __pOnOffBitmap[NUMBER_OF_CHECK_BUTTON_STATUS];
- Tizen::Graphics::Bitmap* __pOnOffSlidingOnBgBitmap[NUMBER_OF_CHECK_BUTTON_STATUS];
- Tizen::Graphics::Bitmap* __pOnOffSlidingOffBgBitmap[NUMBER_OF_CHECK_BUTTON_STATUS];
- Tizen::Graphics::Bitmap* __pOnOffSlidingHandlerBitmap[NUMBER_OF_CHECK_BUTTON_STATUS];
+ Tizen::Graphics::Bitmap* __pOnOffSlidingBgBitmap[NUMBER_OF_CHECK_BUTTON_STATUS];
+ Tizen::Graphics::Bitmap* __pOnOffSlidingOnHandlerBitmap[NUMBER_OF_CHECK_BUTTON_STATUS];
+ Tizen::Graphics::Bitmap* __pOnOffSlidingOffHandlerBitmap[NUMBER_OF_CHECK_BUTTON_STATUS];
Tizen::Graphics::Bitmap* __pCircleBitmap[NUMBER_OF_CHECK_BUTTON_STATUS];
Tizen::Graphics::Bitmap* __pCircleNormalEffectBitmap;
TOOLBAR_HEADER_SEGMENTED_WITH_TITLE,
TOOLBAR_TAB,
TOOLBAR_TAB_WITH_TITLE,
+ TOOLBAR_TAB_LARGE,
TOOLBAR_SEGMENTED,
TOOLBAR_TEXT,
TOOLBAR_ICON,
DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_EFFECT_NORMAL, 79);
DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_EFFECT_PRESSED, 80);
+ DECLARE_IMAGE_CONFIG(ONOFF_SLIDING_BG_NORMAL, 81);
+ DECLARE_IMAGE_CONFIG(ONOFF_SLIDING_BG_DISABLED, 82);
+ DECLARE_IMAGE_CONFIG(ONOFF_SLIDING_BG_PRESSED, 83);
+ DECLARE_IMAGE_CONFIG(ONOFF_SLIDING_BG_HIGHLIGHTED, 84);
+ DECLARE_IMAGE_CONFIG(ONOFF_SLIDING_BG_SELECTED, 85);
+
+ DECLARE_IMAGE_CONFIG(ONOFF_SLIDING_ON_HANDLER_NORMAL, 86);
+ DECLARE_IMAGE_CONFIG(ONOFF_SLIDING_ON_HANDLER_DISABLED, 87);
+ DECLARE_IMAGE_CONFIG(ONOFF_SLIDING_ON_HANDLER_PRESSED, 88);
+ DECLARE_IMAGE_CONFIG(ONOFF_SLIDING_ON_HANDLER_HIGHLIGHTED, 89);
+ DECLARE_IMAGE_CONFIG(ONOFF_SLIDING_ON_HANDLER_SELECTED, 90);
+
+ DECLARE_IMAGE_CONFIG(ONOFF_SLIDING_OFF_HANDLER_NORMAL, 91);
+ DECLARE_IMAGE_CONFIG(ONOFF_SLIDING_OFF_HANDLER_DISABLED, 92);
+ DECLARE_IMAGE_CONFIG(ONOFF_SLIDING_OFF_HANDLER_PRESSED, 93);
+ DECLARE_IMAGE_CONFIG(ONOFF_SLIDING_OFF_HANDLER_HIGHLIGHTED, 94);
+ DECLARE_IMAGE_CONFIG(ONOFF_SLIDING_OFF_HANDLER_SELECTED, 95);
+
//Dimension config
DECLARE_DIMENSION_CONFIG(MIN_SIZE, 1);
DECLARE_DIMENSION_CONFIG(MIN_DIMENSION, 2);
DECLARE_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_DISABLED, 112);
DECLARE_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_PRESSED, 113);
DECLARE_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_HIGHLIGHTED, 114);
- DECLARE_IMAGE_CONFIG(TAB_ITEM_BG_EFFECT_PRESSED, 115);
+ //DECLARE_IMAGE_CONFIG(TAB_ITEM_BG_EFFECT_PRESSED, 115);
DECLARE_IMAGE_CONFIG(TAB_ITEM_SELECTED, 116);
+ DECLARE_IMAGE_CONFIG(BG_EFFECT_NORMAL, 117);
+ DECLARE_IMAGE_CONFIG(TRANSLUCENT_BG_EFFECT_NORMAL, 118);
+
+ DECLARE_IMAGE_CONFIG(BUTTON_BG_EFFECT_NORMAL, 119);
+ DECLARE_IMAGE_CONFIG(BUTTON_BG_EFFECT_PRESSED, 120);
+ DECLARE_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_EFFECT_NORMAL, 121);
+ DECLARE_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_EFFECT_PRESSED, 122);
+
+ DECLARE_IMAGE_CONFIG(SEGMENTED_ITEM_BG_EFFECT_NORMAL, 123);
+ DECLARE_IMAGE_CONFIG(SEGMENTED_ITEM_BG_EFFECT_PRESSED, 124);
+ DECLARE_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, 125);
+ DECLARE_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, 126);
+
+ DECLARE_IMAGE_CONFIG(TAB_ITEM_BG_EFFECT_NORMAL, 127);
+ DECLARE_IMAGE_CONFIG(TAB_ITEM_BG_EFFECT_PRESSED, 128);
+ DECLARE_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, 129);
+ DECLARE_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, 130);
+
+ DECLARE_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, 131);
+ DECLARE_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, 132);
+
//SHAPE
DECLARE_SHAPE_CONFIG(HEIGHT, 1);
DECLARE_SHAPE_CONFIG(WIDTH, 2);
DECLARE_SHAPE_CONFIG(SOFTKEY_ICON_SIZE, 43);
DECLARE_SHAPE_CONFIG(BUTTON_ITEM_MULTILINE_FONT_SIZE, 44);
DECLARE_SHAPE_CONFIG(SOFTKEY_MULTILINE_TEXT_SIZE, 45);
+ DECLARE_SHAPE_CONFIG(TAB_LARGE_HEIGHT, 46);
+
DECLARE_DIMENSION_CONFIG(SOFTKEY_RECT, 1);
DECLARE_DIMENSION_CONFIG(SOFTKEY_RECT_WITH_TEXT, 2);
DECLARE_DIMENSION_CONFIG(SOFTKEY_DISPLAY_RECT_WITH_TEXT, 3);
DECLARE_IMAGE_CONFIG(BUTTON_BG_DISABLED, 4);
DECLARE_IMAGE_CONFIG(BUTTON_BG_PRESSED, 5);
DECLARE_IMAGE_CONFIG(BUTTON_BG_HIGHLIGHTED, 6);
- DECLARE_IMAGE_CONFIG(TAB_ITEM_BG_EFFECT_PRESSED, 7);
+ //DECLARE_IMAGE_CONFIG(TAB_ITEM_BG_EFFECT_PRESSED, 7);
DECLARE_IMAGE_CONFIG(TAB_ITEM_SELECTED, 8);
DECLARE_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_VERTICAL, 9);
DECLARE_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_VERTICAL, 10);
DECLARE_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_PRESSED, 56);
DECLARE_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, 57);
+ DECLARE_IMAGE_CONFIG(BG_EFFECT_NORMAL, 58);
+ DECLARE_IMAGE_CONFIG(TRANSLUCENT_BG_EFFECT_NORMAL, 59);
+
+ DECLARE_IMAGE_CONFIG(BUTTON_BG_EFFECT_NORMAL, 60);
+ DECLARE_IMAGE_CONFIG(BUTTON_BG_EFFECT_PRESSED, 61);
+ DECLARE_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_EFFECT_NORMAL, 62);
+ DECLARE_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_EFFECT_PRESSED, 63);
+
+ DECLARE_IMAGE_CONFIG(SEGMENTED_ITEM_BG_EFFECT_NORMAL, 64);
+ DECLARE_IMAGE_CONFIG(SEGMENTED_ITEM_BG_EFFECT_PRESSED, 65);
+ DECLARE_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, 66);
+ DECLARE_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, 67);
+
+ DECLARE_IMAGE_CONFIG(TAB_ITEM_BG_EFFECT_NORMAL, 68);
+ DECLARE_IMAGE_CONFIG(TAB_ITEM_BG_EFFECT_PRESSED, 69);
+ DECLARE_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, 70);
+ DECLARE_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, 71);
+
+ DECLARE_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, 72);
+ DECLARE_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, 73);
+
DECLARE_ANIMATION_CONFIG(PROCESSING_ANIMATION, 1);
DECLARE_SHAPE_CONFIG(HEIGHT, 1);
DECLARE_SHAPE_CONFIG(WIDTH, 2);
DECLARE_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE_4_ITEM, 69);
DECLARE_SHAPE_CONFIG(SEGMENTED_ITEM_MULTILINE_FONT_SIZE, 70);
DECLARE_SHAPE_CONFIG(TAB_ITEM_MULTILINE_FONT_SIZE, 71);
+ DECLARE_SHAPE_CONFIG(TAB_LARGE_HEIGHT, 72);
DECLARE_END_UI_CONFIG(HEADER);
ADD_IMAGE_CONFIG(BG_HIGHLIGHTED, #00_button_01_focus.#.png);
ADD_IMAGE_CONFIG(BG_EFFECT_NORMAL, #00_button_01_ef.#.png);
- ADD_IMAGE_CONFIG(BG_EFFECT_DISABLED, #00_button_01_ef_dim.#.png);
- ADD_IMAGE_CONFIG(BG_EFFECT_PRESSED, #00_button_01_ef_press.#.png);
+ ADD_IMAGE_CONFIG(BG_EFFECT_DISABLED, #00_button_01_dim_ef.#.png);
+ ADD_IMAGE_CONFIG(BG_EFFECT_PRESSED, #00_button_01_press_ef.#.png);
ADD_IMAGE_CONFIG(BG_EFFECT_HIGHLIGHTED, #00_button_01_ef.#.png);
START_UI_CONFIG_MODE(480x800);
ADD_IMAGE_CONFIG(MARK_ICON_BG_HIGHLIGHTED, #00_check_focus.png);
ADD_IMAGE_CONFIG(MARK_ICON_BG_SELECTED, #00_check_bg.png);
- ADD_IMAGE_CONFIG(MARK_ICON_NORMAL, #00_check_Activated.png);
- ADD_IMAGE_CONFIG(MARK_ICON_DISABLED, #00_check_Activated_dim.png);
+ ADD_IMAGE_CONFIG(MARK_ICON_NORMAL, #00_check_activated.png);
+ ADD_IMAGE_CONFIG(MARK_ICON_DISABLED, #00_check_activated_dim.png);
ADD_IMAGE_CONFIG(MARK_ICON_PRESSED, #00_check_press.png);
- ADD_IMAGE_CONFIG(MARK_ICON_HIGHLIGHTED, #00_check_Activated.png);
- ADD_IMAGE_CONFIG(MARK_ICON_SELECTED, #00_check_Activated.png);
+ ADD_IMAGE_CONFIG(MARK_ICON_HIGHLIGHTED, #00_check_activated.png);
+ ADD_IMAGE_CONFIG(MARK_ICON_SELECTED, #00_check_activated.png);
ADD_IMAGE_CONFIG(ONOFF_ICON_BG_NORMAL, #00_button_radio_bg.png);
ADD_IMAGE_CONFIG(ONOFF_ICON_BG_DISABLED, #00_button_radio_dim_bg.png);
ADD_IMAGE_CONFIG(ONOFF_ICON_BG_HIGHLIGHTED,#00_button_radio_focus.png);
ADD_IMAGE_CONFIG(ONOFF_ICON_BG_SELECTED, #00_button_radio_bg.png);
- ADD_IMAGE_CONFIG(ONOFF_ICON_NORMAL, #00_button_radio_Activated.png);
- ADD_IMAGE_CONFIG(ONOFF_ICON_DISABLED, #00_button_radio_Activated_dim.png);
+ ADD_IMAGE_CONFIG(ONOFF_ICON_NORMAL, #00_button_radio_activated.png);
+ ADD_IMAGE_CONFIG(ONOFF_ICON_DISABLED, #00_button_radio_activated_dim.png);
ADD_IMAGE_CONFIG(ONOFF_ICON_PRESSED, #00_button_radio_press.png);
- ADD_IMAGE_CONFIG(ONOFF_ICON_HIGHLIGHTED, #00_button_radio_Activated.png);
- ADD_IMAGE_CONFIG(ONOFF_ICON_SELECTED, #00_button_radio_Activated.png);
+ ADD_IMAGE_CONFIG(ONOFF_ICON_HIGHLIGHTED, #00_button_radio_activated.png);
+ ADD_IMAGE_CONFIG(ONOFF_ICON_SELECTED, #00_button_radio_activated.png);
ADD_IMAGE_CONFIG(ONOFF_SLIDING_ON_BG_NORMAL, #00_button_on.png);
ADD_IMAGE_CONFIG(ONOFF_SLIDING_ON_BG_DISABLED, #00_button_on_dim.png);
ADD_IMAGE_CONFIG(ONOFF_SLIDING_HANDLER_HIGHLIGHTED, #00_button_on_off_handler_focus.png);
ADD_IMAGE_CONFIG(ONOFF_SLIDING_HANDLER_SELECTED, #00_button_on_off_handler.png);
+
+
+
+
+ ADD_IMAGE_CONFIG(ONOFF_SLIDING_BG_NORMAL, #00_button_on_off_bg.png);
+ ADD_IMAGE_CONFIG(ONOFF_SLIDING_BG_DISABLED, #00_button_on_off_bg_dim.png);
+ ADD_IMAGE_CONFIG(ONOFF_SLIDING_BG_PRESSED, #00_button_on_off_bg.png);
+ ADD_IMAGE_CONFIG(ONOFF_SLIDING_BG_HIGHLIGHTED, #00_button_on_off_bg.png);
+ ADD_IMAGE_CONFIG(ONOFF_SLIDING_BG_SELECTED, #00_button_on_off_bg.png);
+
+ ADD_IMAGE_CONFIG(ONOFF_SLIDING_ON_HANDLER_NORMAL, #00_button_on_handler.png);
+ ADD_IMAGE_CONFIG(ONOFF_SLIDING_ON_HANDLER_DISABLED, #00_button_on_handler_dim.png);
+ ADD_IMAGE_CONFIG(ONOFF_SLIDING_ON_HANDLER_PRESSED, #00_button_on_handler.png);
+ ADD_IMAGE_CONFIG(ONOFF_SLIDING_ON_HANDLER_HIGHLIGHTED, #00_button_of_off_handler_focus.png);
+ ADD_IMAGE_CONFIG(ONOFF_SLIDING_ON_HANDLER_SELECTED, #00_button_on_handler.png);
+
+ ADD_IMAGE_CONFIG(ONOFF_SLIDING_OFF_HANDLER_NORMAL, #00_button_off_handler.png);
+ ADD_IMAGE_CONFIG(ONOFF_SLIDING_OFF_HANDLER_DISABLED, #00_button_off_handler_dim.png);
+ ADD_IMAGE_CONFIG(ONOFF_SLIDING_OFF_HANDLER_PRESSED, #00_button_off_handler.png);
+ ADD_IMAGE_CONFIG(ONOFF_SLIDING_OFF_HANDLER_HIGHLIGHTED, #00_button_of_off_handler_focus.png);
+ ADD_IMAGE_CONFIG(ONOFF_SLIDING_OFF_HANDLER_SELECTED, #00_button_off_handler.png);
+
+
+
+
+
+
ADD_IMAGE_CONFIG(DETAILED_BG_NORMAL, #00_circle_bg.png);
ADD_IMAGE_CONFIG(DETAILED_BG_DISABLED, #00_circle_bg.png);
ADD_IMAGE_CONFIG(DETAILED_BG_PRESSED, #00_circle_bg.png);
ADD_IMAGE_CONFIG(DETAILED_ICON_HIGHLIGHTED, #00_button_right.png);
ADD_IMAGE_CONFIG(DETAILED_ICON_SELECTED, #00_button_right.png);
- ADD_IMAGE_CONFIG(DETAILED_ICON_EFFECT_NORMAL, # #00_button_right_ef.png); //not supported by theme
- ADD_IMAGE_CONFIG(DETAILED_ICON_EFFECT_PRESSED, # #00_button_right_ef.png); //not supported by theme
+ ADD_IMAGE_CONFIG(DETAILED_ICON_EFFECT_NORMAL, #00_button_right_ef.png); //not supported by theme
+ ADD_IMAGE_CONFIG(DETAILED_ICON_EFFECT_PRESSED, #00_button_right_ef.png); //not supported by theme
ADD_IMAGE_CONFIG(GROUPED_SINGLE_BG_NORMAL, #00_list_group_bg.#.png);
ADD_IMAGE_CONFIG(GROUPED_SINGLE_BG_DISABLED, #00_list_group_bg.#.png);
ADD_SHAPE_CONFIG(MARK_BITMAP_HEIGHT, 63);
ADD_SHAPE_CONFIG(ONOFF_SLIDING_BITMAP_WIDTH, 135);
ADD_SHAPE_CONFIG(ONOFF_SLIDING_BITMAP_HEIGHT, 63);
- ADD_SHAPE_CONFIG(ONOFF_SLIDING_HANDLER_WIDTH, 63);
+ ADD_SHAPE_CONFIG(ONOFF_SLIDING_HANDLER_WIDTH, 81);
ADD_SHAPE_CONFIG(ONOFF_SLIDING_HANDLER_MARGIN, 0);
ADD_SHAPE_CONFIG(DETAILED_BITMAP_WIDTH, 72);
ADD_SHAPE_CONFIG(DETAILED_BITMAP_HEIGHT, 72);
ADD_SHAPE_CONFIG(MARK_BITMAP_HEIGHT, 63);
ADD_SHAPE_CONFIG(ONOFF_SLIDING_BITMAP_WIDTH, 135);
ADD_SHAPE_CONFIG(ONOFF_SLIDING_BITMAP_HEIGHT, 63);
- ADD_SHAPE_CONFIG(ONOFF_SLIDING_HANDLER_WIDTH, 63);
+ ADD_SHAPE_CONFIG(ONOFF_SLIDING_HANDLER_WIDTH, 81);
ADD_SHAPE_CONFIG(ONOFF_SLIDING_HANDLER_MARGIN, 0);
ADD_SHAPE_CONFIG(DETAILED_BITMAP_WIDTH, 72);
ADD_SHAPE_CONFIG(DETAILED_BITMAP_HEIGHT, 72);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_NORMAL, $B0515L1);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_DISABLED, $B0515L1);
- ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_PRESSED, $B0514P1);
+ ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_PRESSED, $B0511P);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_HIGHLIGHTED, $W161);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_SELECTED, $B0515L1);
ADD_COLOR_CONFIG(TAB_ITEM_BG_NORMAL, $B0515L1);
ADD_COLOR_CONFIG(TAB_ITEM_BG_DISABLED, $B0515L1);
- ADD_COLOR_CONFIG(TAB_ITEM_BG_PRESSED, $B0514P1);
+ ADD_COLOR_CONFIG(TAB_ITEM_BG_PRESSED, $B0511P);
ADD_COLOR_CONFIG(TAB_ITEM_BG_HIGHLIGHTED, $W161);
ADD_COLOR_CONFIG(TAB_ITEM_BG_SELECTED, $B0515L1);
ADD_IMAGE_CONFIG(BG_NORMAL, #00_toolbar_bg.#.png);
ADD_IMAGE_CONFIG(TRANSLUCENT_BG_NORMAL, #00_toolbar_bg.#.png);
+ ADD_IMAGE_CONFIG(BG_EFFECT_NORMAL, #00_toolbar_bg_ef.#.png);
+ ADD_IMAGE_CONFIG(TRANSLUCENT_BG_EFFECT_NORMAL, #00_toolbar_bg_ef.#.png);
+
ADD_IMAGE_CONFIG(BUTTON_BG_NORMAL, #00_toolbar_bg.#.png);
ADD_IMAGE_CONFIG(BUTTON_BG_DISABLED, #00_toolbar_bg.#.png);
- ADD_IMAGE_CONFIG(BUTTON_BG_PRESSED, #00_toolbar_press.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_BG_PRESSED, #00_toolbar_bg.#.png);
ADD_IMAGE_CONFIG(BUTTON_BG_HIGHLIGHTED, #00_focus.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_BG_EFFECT_NORMAL, #00_toolbar_bg_ef.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_BG_EFFECT_PRESSED, #00_toolbar_press_ef.#.png);
+
ADD_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_NORMAL, #00_toolbar_bg.#.png); //added
ADD_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_DISABLED, #00_toolbar_bg.#.png);//added
- ADD_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_PRESSED, #00_toolbar_press.#.png);//added
+ ADD_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_PRESSED, #00_toolbar_bg.#.png);//added
ADD_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_HIGHLIGHTED, #00_focus.#.png);//added
+ ADD_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_EFFECT_NORMAL, #00_toolbar_bg_ef.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_EFFECT_PRESSED, #00_toolbar_press_ef.#.png);
+
ADD_IMAGE_CONFIG(SEGMENTED_ITEM_BG_NORMAL, #00_toolbar_bg.#.png);//added
ADD_IMAGE_CONFIG(SEGMENTED_ITEM_BG_DISABLED, #00_toolbar_bg.#.png);//added
- ADD_IMAGE_CONFIG(SEGMENTED_ITEM_BG_PRESSED, #00_toolbar_bg.#.png);//added
- ADD_IMAGE_CONFIG(SEGMENTED_ITEM_BG_HIGHLIGHTED, #00_focus.#.png);//added
+ ADD_IMAGE_CONFIG(SEGMENTED_ITEM_BG_PRESSED, #00_tab_press_bg.#.png);//added
+ ADD_IMAGE_CONFIG(SEGMENTED_ITEM_BG_HIGHLIGHTED, #00_tab_focus.#.png);//added
ADD_IMAGE_CONFIG(SEGMENTED_ITEM_BG_SELECTED, #00_toolbar_bg.#.png);//added
+ ADD_IMAGE_CONFIG(SEGMENTED_ITEM_BG_EFFECT_NORMAL, #00_toolbar_bg_ef.#.png);
+ ADD_IMAGE_CONFIG(SEGMENTED_ITEM_BG_EFFECT_PRESSED, #00_tab_press_ef.#.png);
+
ADD_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_NORMAL, #00_toolbar_bg.#.png);//added
ADD_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_DISABLED, #00_toolbar_bg.#.png);//added
- ADD_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_PRESSED, #00_toolbar_bg.#.png);//added
- ADD_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, #00_focus.#.png);//added
+ ADD_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_PRESSED, #00_tab_press_bg.#.png);//added
+ ADD_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, #00_tab_focus.#.png);//added
ADD_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_SELECTED, #00_toolbar_bg.#.png);//added
+ ADD_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, #00_toolbar_bg_ef.#.png);
+ ADD_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, #00_tab_press_ef.#.png);
+
ADD_IMAGE_CONFIG(TAB_ITEM_BG_NORMAL, #00_toolbar_bg.#.png);
ADD_IMAGE_CONFIG(TAB_ITEM_BG_DISABLED, #00_toolbar_bg.#.png);
- ADD_IMAGE_CONFIG(TAB_ITEM_BG_PRESSED, #00_toolbar_bg.#.png);
- ADD_IMAGE_CONFIG(TAB_ITEM_BG_HIGHLIGHTED, #00_focus.#.png);
+ ADD_IMAGE_CONFIG(TAB_ITEM_BG_PRESSED, #00_tab_press_bg.#.png);
+ ADD_IMAGE_CONFIG(TAB_ITEM_BG_HIGHLIGHTED, #00_tab_focus.#.png);
ADD_IMAGE_CONFIG(TAB_ITEM_BG_SELECTED, #00_toolbar_bg.#.png);
+ ADD_IMAGE_CONFIG(TAB_ITEM_BG_EFFECT_NORMAL, #00_toolbar_bg_ef.#.png);
+ ADD_IMAGE_CONFIG(TAB_ITEM_BG_EFFECT_PRESSED, #00_tab_press_ef.#.png);
+
ADD_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_NORMAL, #00_toolbar_bg.#.png);//added
ADD_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_DISABLED, #00_toolbar_bg.#.png);//added
ADD_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_PRESSED, #00_toolbar_bg.#.png);//added
- ADD_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, #00_focus.#.png);//added
+ ADD_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, #00_tab_focus.#.png);//added
ADD_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_SELECTED, #00_toolbar_bg.#.png);//added
- ADD_IMAGE_CONFIG(TAB_ITEM_BG_EFFECT_PRESSED, #00_tab_press_ef.#.png);
- ADD_IMAGE_CONFIG(TAB_ITEM_SELECTED, #00_tab_focus.#.png);
+ ADD_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, #00_toolbar_bg_ef.#.png);
+ ADD_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, #00_tab_press_ef.#.png);
+
+ //ADD_IMAGE_CONFIG(TAB_ITEM_BG_EFFECT_PRESSED, #00_tab_press_ef.#.png);
+ ADD_IMAGE_CONFIG(TAB_ITEM_SELECTED, #00_tab_select_bar.#.png);
+
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_NORMAL, #00_toolbar_bg.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_DISABLED, #00_toolbar_bg.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_PRESSED, #00_toolbar_bg.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_HIGHLIGHTED, #00_focus.#.png);
- ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_NORMAL, #00_toolbar_button_bg.#.png);
- ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_DISABLED, #00_toolbar_button_bg.#.png);
- ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_PRESSED, #00_toolbar_button_bg.#.png);
- ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_HIGHLIGHTED, #00_toolbar_button_ef_focus.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_EFFECT_NORMAL, #00_toolbar_bg_ef.#.png); //not supported by theme
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_EFFECT_PRESSED, #00_toolbar_press_ef.#.png); //not supported by theme
- ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_EFFECT_NORMAL, #00_toolbar_button_ef.#.png); //not supported by theme
- ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_EFFECT_PRESSED, #00_toolbar_button_ef_press.#.png); //not supported by theme
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_NORMAL, #00_toolbar_bg.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_DISABLED, #00_toolbar_bg.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_PRESSED, #00_toolbar_bg.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, #00_focus.#.png);
- ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_NORMAL, #00_toolbar_button.#.png);
- ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_DISABLED, #00_toolbar_button.#.png);
- ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_PRESSED, #00_toolbar_button_press.#.png);
- ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, #00_toolbar_button_ef_focus.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, #00_toolbar_bg_ef.#.png); //not supported by theme
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, #00_toolbar_press_ef.#.png); //not supported by theme
- ADD_IMAGE_CONFIG(BACK_ICON_NORMAL, #00_icon_Back.png);
- ADD_IMAGE_CONFIG(BACK_ICON_DISABLED, #00_icon_Back.png);
- ADD_IMAGE_CONFIG(BACK_ICON_PRESSED, #00_icon_Back.png);
- ADD_IMAGE_CONFIG(BACK_ICON_HIGHLIGHTED, #00_icon_Back.png);
+ ADD_IMAGE_CONFIG(BACK_ICON_NORMAL, #00_icon_back.png);
+ ADD_IMAGE_CONFIG(BACK_ICON_DISABLED, #00_icon_back.png);
+ ADD_IMAGE_CONFIG(BACK_ICON_PRESSED, #00_icon_back.png);
+ ADD_IMAGE_CONFIG(BACK_ICON_HIGHLIGHTED, #00_icon_back.png);
- ADD_IMAGE_CONFIG(BACK_ICON_EFFECT_NORMAL, #00_icon_Back_ef.png); //not supported by theme
- ADD_IMAGE_CONFIG(BACK_ICON_EFFECT_PRESSED, #00_icon_Back_ef.png); //not supported by theme
+ ADD_IMAGE_CONFIG(BACK_ICON_EFFECT_NORMAL, #00_icon_back_ef.png); //not supported by theme
+ ADD_IMAGE_CONFIG(BACK_ICON_EFFECT_PRESSED, #00_icon_back_ef.png); //not supported by theme
ADD_IMAGE_CONFIG(BACK_ICON_EFFECT_NORMAL2, #00_icon_Back_ef_02.png); //not supported by theme
ADD_IMAGE_CONFIG(BACK_ICON_EFFECT_PRESSED2, #00_icon_Back_ef_02.png); //not supported by theme
- ADD_IMAGE_CONFIG(BACK_ICON_TRANSLUCENT_EFFECT_NORMAL, #00_icon_Back_trans_ef.png); //not supported by theme
- ADD_IMAGE_CONFIG(BACK_ICON_TRANSLUCENT_EFFECT_PRESSED, #00_icon_Back_trans_ef.png); //not supported by theme
+ ADD_IMAGE_CONFIG(BACK_ICON_TRANSLUCENT_EFFECT_NORMAL, #00_icon_back_trans_ef.png); //not supported by theme
+ ADD_IMAGE_CONFIG(BACK_ICON_TRANSLUCENT_EFFECT_PRESSED, #00_icon_back_trans_ef.png); //not supported by theme
ADD_IMAGE_CONFIG(HIDE_ICON_NORMAL, #00_icon_SIP_close.png);
ADD_IMAGE_CONFIG(HIDE_ICON_DISABLED, #00_icon_SIP_close.png);
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);
- ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_VERTICAL, #00_effect_toolbar_tab_bounce_right.png);
- ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_HORIZONTAL, #00_effect_toolbar_tab_bounce_left_h.png);
- ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_HORIZONTAL, #00_effect_toolbar_tab_bounce_right_h.png);
+ 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
//SHAPE
START_UI_CONFIG_MODE(720x1280);
ADD_SHAPE_CONFIG(SOFTKEY_TOP_MARGIN, 19);
ADD_SHAPE_CONFIG(SOFTKEY_1_LEFT_MARGIN, 8);
ADD_SHAPE_CONFIG(SOFTKEY_ICON_SIZE, 92);
+ ADD_SHAPE_CONFIG(TAB_LARGE_HEIGHT, 126);
ADD_DIMENSION_CONFIG(SOFTKEY_RECT, 144, 117);
ADD_DIMENSION_CONFIG(SOFTKEY_RECT_WITH_TEXT, 207, 117);
ADD_DIMENSION_CONFIG(SOFTKEY_DISPLAY_RECT_WITH_TEXT, 196, 92);
ADD_SHAPE_CONFIG(SOFTKEY_TOP_MARGIN, 19);
ADD_SHAPE_CONFIG(SOFTKEY_1_LEFT_MARGIN, 8);
ADD_SHAPE_CONFIG(SOFTKEY_ICON_SIZE, 92);
+ ADD_SHAPE_CONFIG(TAB_LARGE_HEIGHT, 126);
ADD_DIMENSION_CONFIG(SOFTKEY_RECT, 144, 117);
ADD_DIMENSION_CONFIG(SOFTKEY_RECT_WITH_TEXT, 207, 117);
ADD_DIMENSION_CONFIG(SOFTKEY_DISPLAY_RECT_WITH_TEXT, 196, 92);
ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_PRESSED, $B052L8P);
ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_HIGHLIGHTED, $B052L8);
- ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_NORMAL, $B0513);
- ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_DISABLED, $B0513);
+ ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_NORMAL, $B0511);
+ ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_DISABLED, $B0511);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_PRESSED, $B0514P1);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_HIGHLIGHTED, $W161);
- ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_SELECTED, $B0513);
+ ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_SELECTED, $B0511);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_NORMAL, $B013);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_DISABLED, $B013);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED, $B052L8);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_SELECTED, $B052L8P);
- ADD_COLOR_CONFIG(TAB_ITEM_BG_NORMAL, $B0513);
- ADD_COLOR_CONFIG(TAB_ITEM_BG_DISABLED, $B0513);
+ ADD_COLOR_CONFIG(TAB_ITEM_BG_NORMAL, $B0511);
+ ADD_COLOR_CONFIG(TAB_ITEM_BG_DISABLED, $B0511);
ADD_COLOR_CONFIG(TAB_ITEM_BG_PRESSED, $B0514P1);
ADD_COLOR_CONFIG(TAB_ITEM_BG_HIGHLIGHTED, $W161);
- ADD_COLOR_CONFIG(TAB_ITEM_BG_SELECTED, $B0513);
+ ADD_COLOR_CONFIG(TAB_ITEM_BG_SELECTED, $B0511);
ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_BG_NORMAL, $B013);
ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_BG_DISABLED, $B013);
ADD_IMAGE_CONFIG(BG_NORMAL, #00_title_bg.#.png);
ADD_IMAGE_CONFIG(TRANSLUCENT_BG_NORMAL, #00_title_bg.#.png);
+ ADD_IMAGE_CONFIG(BG_EFFECT_NORMAL, #00_title_bg_ef.#.png);
+ ADD_IMAGE_CONFIG(TRANSLUCENT_BG_EFFECT_NORMAL, #00_title_bg_ef.#.png);
+
ADD_IMAGE_CONFIG(BUTTON_BG_NORMAL, #00_title_bg.#.png);
ADD_IMAGE_CONFIG(BUTTON_BG_DISABLED, #00_title_bg.#.png);
ADD_IMAGE_CONFIG(BUTTON_BG_PRESSED, #00_title_bg.#.png);
ADD_IMAGE_CONFIG(BUTTON_BG_HIGHLIGHTED, #00_focus.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_BG_EFFECT_NORMAL, #00_title_bg_ef.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_BG_EFFECT_PRESSED, #00_title_press_ef.#.png);
+
ADD_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_NORMAL, #00_title_bg.#.png);//added
ADD_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_DISABLED, #00_title_bg.#.png);//added
ADD_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_PRESSED, #00_title_bg.#.png);//added
ADD_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_HIGHLIGHTED, #00_focus.#.png);//added
+ ADD_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_EFFECT_NORMAL, #00_title_bg_ef.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_TRANSLUCENT_BG_EFFECT_PRESSED, #00_title_press_ef.#.png);
+
ADD_IMAGE_CONFIG(SEGMENTED_ITEM_BG_NORMAL, #00_title_bg.#.png);//added
ADD_IMAGE_CONFIG(SEGMENTED_ITEM_BG_DISABLED, #00_title_bg.#.png);//added
- ADD_IMAGE_CONFIG(SEGMENTED_ITEM_BG_PRESSED, #00_title_bg.#.png);//added
- ADD_IMAGE_CONFIG(SEGMENTED_ITEM_BG_HIGHLIGHTED, #00_focus.#.png);//added
+ ADD_IMAGE_CONFIG(SEGMENTED_ITEM_BG_PRESSED, #00_tab_press_bg.#.png);//added
+ ADD_IMAGE_CONFIG(SEGMENTED_ITEM_BG_HIGHLIGHTED, #00_tab_focus.#.png);//added
ADD_IMAGE_CONFIG(SEGMENTED_ITEM_BG_SELECTED, #00_title_bg.#.png);//added
+ ADD_IMAGE_CONFIG(SEGMENTED_ITEM_BG_EFFECT_NORMAL, #00_title_bg_ef.#.png);
+ ADD_IMAGE_CONFIG(SEGMENTED_ITEM_BG_EFFECT_PRESSED, #00_tab_press_ef.#.png);
+
ADD_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_NORMAL, #00_title_bg.#.png);//added
ADD_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_DISABLED, #00_title_bg.#.png);//added
- ADD_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_PRESSED, #00_title_bg.#.png);//added
- ADD_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, #00_focus.#.png);//added
+ ADD_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_PRESSED, #00_tab_press_bg.#.png);//added
+ ADD_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, #00_tab_focus.#.png);//added
ADD_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_SELECTED, #00_title_bg.#.png);//added
+ ADD_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, #00_title_bg_ef.#.png);
+ ADD_IMAGE_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, #00_tab_press_ef.#.png);
+
ADD_IMAGE_CONFIG(TAB_ITEM_BG_NORMAL, #00_title_bg.#.png);
ADD_IMAGE_CONFIG(TAB_ITEM_BG_DISABLED, #00_title_bg.#.png);
- ADD_IMAGE_CONFIG(TAB_ITEM_BG_PRESSED, #00_title_bg.#.png);
- ADD_IMAGE_CONFIG(TAB_ITEM_BG_HIGHLIGHTED, #00_focus.#.png);
+ ADD_IMAGE_CONFIG(TAB_ITEM_BG_PRESSED, #00_tab_press_bg.#.png);
+ ADD_IMAGE_CONFIG(TAB_ITEM_BG_HIGHLIGHTED, #00_tab_focus.#.png);
ADD_IMAGE_CONFIG(TAB_ITEM_BG_SELECTED, #00_title_bg.#.png);
+ ADD_IMAGE_CONFIG(TAB_ITEM_BG_EFFECT_NORMAL, #00_title_bg_ef.#.png);
+ ADD_IMAGE_CONFIG(TAB_ITEM_BG_EFFECT_PRESSED, #00_tab_press_ef.#.png);
+
ADD_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_NORMAL, #00_title_bg.#.png);//added
ADD_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_DISABLED, #00_title_bg.#.png);//added
- ADD_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_PRESSED, #00_title_bg.#.png);//added
- ADD_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, #00_focus.#.png);//added
+ ADD_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_PRESSED, #00_tab_press_bg.#.png);//added
+ ADD_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, #00_tab_focus.#.png);//added
ADD_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_SELECTED, #00_title_bg.#.png);//added
- ADD_IMAGE_CONFIG(TAB_ITEM_BG_EFFECT_PRESSED, #00_tab_press_ef.#.png);
- ADD_IMAGE_CONFIG(TAB_ITEM_SELECTED, #00_tab_focus.#.png);
+ ADD_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, #00_title_bg_ef.#.png);
+ ADD_IMAGE_CONFIG(TAB_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, #00_tab_press_ef.#.png);
+
+ //ADD_IMAGE_CONFIG(TAB_ITEM_BG_EFFECT_PRESSED, #00_tab_press_ef.#.png);
+ ADD_IMAGE_CONFIG(TAB_ITEM_SELECTED, #00_tab_select_bar.#.png);
+
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_NORMAL, #00_title_bg.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_DISABLED, #00_title_bg.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_PRESSED, #00_title_bg.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_HIGHLIGHTED, #00_focus.#.png);
- ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_NORMAL, #00_toolbar_button_bg.#.png);
- ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_DISABLED, #00_toolbar_button_bg.#.png);
- ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_PRESSED, #00_toolbar_button_bg.#.png);
- ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_HIGHLIGHTED, #00_toolbar_button_ef_focus.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_EFFECT_NORMAL, #00_title_bg_ef.#.png); //not supported by theme
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_EFFECT_PRESSED, #00_title_press_ef.#.png); //not supported by theme
- ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_EFFECT_NORMAL, #00_toolbar_button_ef.#.png); //not supported by theme
- ADD_IMAGE_CONFIG(BUTTON_ITEM_BG_EFFECT_PRESSED, #00_toolbar_button_ef_press.#.png); //not supported by theme
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_NORMAL, #00_title_bg.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_DISABLED, #00_title_bg.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_PRESSED, #00_title_bg.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, #00_focus.#.png);
- ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_NORMAL, #00_toolbar_button.#.png);
- ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_DISABLED, #00_toolbar_button.#.png);
- ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_PRESSED, #00_toolbar_button_press.#.png);
- ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, #00_toolbar_button_ef_focus.#.png);
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, #00_title_bg_ef.#.png); //not supported by theme
+ ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, #00_title_press_ef.#.png); //not supported by theme
- ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_VERTICAL, #00_effect_tab_bounce_left.png);
- ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_VERTICAL, #00_effect_tab_bounce_right.png);
- ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_HORIZONTAL, #00_effect_tab_bounce_left_h.png);
- ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_HORIZONTAL, #00_effect_tab_bounce_right_h.png);
- ADD_IMAGE_CONFIG(TITLE_TAB_ITEM_BOUNCING_EFFECT_LEFT, #00_effect_title_tab_bounce_left.png);
- ADD_IMAGE_CONFIG(TITLE_TAB_ITEM_BOUNCING_EFFECT_RIGHT, #00_effect_title_tab_bounce_right.png);
+ ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_VERTICAL, #00_effect_tab_bounce_left.png);//117
+ ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_VERTICAL, #00_effect_tab_bounce_right.png);//117
+ ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_HORIZONTAL, #00_effect_tab_bounce_left_h.png);//91
+ ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_HORIZONTAL,#00_effect_tab_bounce_right_h.png);//91
+ ADD_IMAGE_CONFIG(TITLE_TAB_ITEM_BOUNCING_EFFECT_LEFT, #00_effect_title_tab_bounce_left.png);//64
+ ADD_IMAGE_CONFIG(TITLE_TAB_ITEM_BOUNCING_EFFECT_RIGHT, #00_effect_title_tab_bounce_right.png);//64
START_ANIMATION_CONFIG(PROCESSING_ANIMATION);
ADD_ANIMATION_FRAME(#00_header_process_01.png, 16);
// SHAPE
START_UI_CONFIG_MODE(720x1280);
- ADD_SHAPE_CONFIG(HEIGHT, 111);
+ ADD_SHAPE_CONFIG(HEIGHT, 96);
ADD_SHAPE_CONFIG(WIDTH, 720);
- ADD_SHAPE_CONFIG(LEFT_MARGIN, 16);
- ADD_SHAPE_CONFIG(TOP_MARGIN, 32);
+ ADD_SHAPE_CONFIG(LEFT_MARGIN, 26);
+ ADD_SHAPE_CONFIG(TOP_MARGIN, 0);
ADD_SHAPE_CONFIG(RIGHT_MARGIN, 26);
- ADD_SHAPE_CONFIG(TITLE_FONT_SIZE, 56);
+ ADD_SHAPE_CONFIG(TITLE_FONT_SIZE, 50);
ADD_SHAPE_CONFIG(TITLE_FONT_SIZE_WITH_DESCRIPTION, 44);
ADD_SHAPE_CONFIG(TITLE_FONT_SIZE_WITH_SEGMENTED, 44);
ADD_SHAPE_CONFIG(DESCRIPTION_TEXT_FONT_SIZE, 32);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_FONT_SIZE, 27);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_MULTILINE_FONT_SIZE, 27);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_FONT_SIZE, 32);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_MULTILINE_FONT_SIZE, 32);
ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE, 30);
- ADD_SHAPE_CONFIG(SEGMENTED_ITEM_MULTILINE_FONT_SIZE, 28);
- ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE_3_ITEM, 26);
- ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE_4_ITEM, 24);
+ ADD_SHAPE_CONFIG(SEGMENTED_ITEM_MULTILINE_FONT_SIZE, 30);
+ ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE_3_ITEM, 30);
+ ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE_4_ITEM, 30);
ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE, 30);
- ADD_SHAPE_CONFIG(TAB_ITEM_MULTILINE_FONT_SIZE, 28);
- ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE_3_ITEM, 26);//720x1280
- ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE_4_ITEM, 24);
+ ADD_SHAPE_CONFIG(TAB_ITEM_MULTILINE_FONT_SIZE, 30);
+ ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE_3_ITEM, 30);//720x1280
+ ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE_4_ITEM, 30);
ADD_SHAPE_CONFIG(BADGE_FONT_SIZE, 26);
ADD_SHAPE_CONFIG(BADGE_FONT_SIZE_WITH_BUTTON, 20);
ADD_SHAPE_CONFIG(BADGE_FONT_SIZE_WITH_BUTTON_2, 16);
- ADD_SHAPE_CONFIG(TITLE_DISPLAY_HEIGHT, 68);
- ADD_SHAPE_CONFIG(TITLE_TOP_MARGIN_WITH_DESCRIPTION, 18);
+ ADD_SHAPE_CONFIG(TITLE_DISPLAY_HEIGHT, 96);
+ ADD_SHAPE_CONFIG(TITLE_TOP_MARGIN_WITH_DESCRIPTION, 4);
ADD_SHAPE_CONFIG(TITLE_TOTAL_HEIGHT_WITH_SEGMENTED_ITEM, 165);
- ADD_SHAPE_CONFIG(TITLE_TOP_MARGIN_WITH_SEGMENTED_ITEM, 18);
- ADD_SHAPE_CONFIG(TITLE_HEIGHT_WITH_SEGMENTED_ITEM, 89);
- ADD_SHAPE_CONFIG(TITLE_DISPLAY_HEIGHT_WITH_SEGMENTED_ITEM, 60);
- ADD_SHAPE_CONFIG(DESCRIPTION_TEXT_HEIGHT, 36);
-
- ADD_SHAPE_CONFIG(BUTTON_ITEM_WIDTH, 85);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_WIDTH_WITH_TEXT, 114);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_HEIGHT, 111);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_GAP, 4);
+ ADD_SHAPE_CONFIG(TITLE_TOP_MARGIN_WITH_SEGMENTED_ITEM, 0);
+ ADD_SHAPE_CONFIG(TITLE_HEIGHT_WITH_SEGMENTED_ITEM, 90);
+ ADD_SHAPE_CONFIG(TITLE_DISPLAY_HEIGHT_WITH_SEGMENTED_ITEM, 90);
+ ADD_SHAPE_CONFIG(DESCRIPTION_TEXT_HEIGHT, 37);
+
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_WIDTH, 115);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_WIDTH_WITH_TEXT, 124);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_HEIGHT, 96);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_GAP, 2);
ADD_SHAPE_CONFIG(BUTTON_ITEM_TOP_MARGIN, 0);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_ICON_TOP_MARGIN, 34);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_ICON_TOP_MARGIN, 10.5);
ADD_SHAPE_CONFIG(BUTTON_ITEM_ICON_SIZE, 63);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_LEFT_TOUCH_MARGIN, 11);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_TOP_TOUCH_MARGIN, 34);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 11);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 14);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_LEFT_TOUCH_MARGIN, 0);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_TOP_TOUCH_MARGIN, 0);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 0);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 0);
- ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_LEFT_TOUCH_MARGIN, 11);
- ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_TOP_TOUCH_MARGIN, 36);
- ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 11);
- ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 12);
+ ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_LEFT_TOUCH_MARGIN, 26);
+ ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_TOP_TOUCH_MARGIN, 16.5);
+ ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 26);
+ ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 16.5);
- ADD_SHAPE_CONFIG(SEGMENTED_ITEM_HEIGHT, 63);
+ ADD_SHAPE_CONFIG(SEGMENTED_ITEM_HEIGHT, 75);
ADD_SHAPE_CONFIG(TAB_ITEM_ICON_SIZE, 63);
ADD_SHAPE_CONFIG(TAB_ITEM_ICON_SIZE_WITH_TEXT, 45);
- ADD_SHAPE_CONFIG(TAB_LEFT_MARGIN, 16);
+ ADD_SHAPE_CONFIG(TAB_LEFT_MARGIN, 0);
ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_TOP_MARGIN, 0);
- ADD_SHAPE_CONFIG(SIP_FOOTER_ITEM_TOP_MARGIN, 32);
+ ADD_SHAPE_CONFIG(SIP_FOOTER_ITEM_TOP_MARGIN, 16.5);
ADD_SHAPE_CONFIG(ICON_WIDTH, 45);
ADD_SHAPE_CONFIG(ICON_TEXT_GAP, 8);
- ADD_SHAPE_CONFIG(DIVIDER_WIDTH, 4);
- ADD_SHAPE_CONFIG(DIVIDER_HEIGHT, 26);
+ ADD_SHAPE_CONFIG(DIVIDER_WIDTH, 2);
+ ADD_SHAPE_CONFIG(DIVIDER_HEIGHT, 48);
ADD_SHAPE_CONFIG(BADGE_HEIGHT, 54);
ADD_SHAPE_CONFIG(BADGE_HEIGHT_WITH_BUTTON, 45);
ADD_SHAPE_CONFIG(TITLE_BADGE_ICON_GAP, 2);
ADD_SHAPE_CONFIG(TITLE_BADGE_TOP_MARGIN, 3);
- ADD_SHAPE_CONFIG(HEADER_ITEM_SELECTED_BITMAP_MARGIN, 16);
- ADD_SHAPE_CONFIG(HEADER_ITEM_SELECTED_BITMAP_HEIGHT, 3);
+ ADD_SHAPE_CONFIG(HEADER_ITEM_SELECTED_BITMAP_MARGIN, 0);
+ ADD_SHAPE_CONFIG(HEADER_ITEM_SELECTED_BITMAP_HEIGHT, 10);
ADD_SHAPE_CONFIG(PROCESSING_ANIMATION_ICON_SIZE, 36);
ADD_SHAPE_CONFIG(PROCESSING_ANIMATION_ICON_GAP, 16);
ADD_SHAPE_CONFIG(ITEM_MINIMUM_WIDTH, 60);
ADD_SHAPE_CONFIG(COMMON_MINIMUM_MARGIN, 8);
+ ADD_SHAPE_CONFIG(TAB_LARGE_HEIGHT, 126);
+
END_UI_CONFIG_MODE(720x1280);
START_UI_CONFIG_MODE(1280x720);
ADD_SHAPE_CONFIG(HEIGHT, 91);
ADD_SHAPE_CONFIG(WIDTH, _SCREEN_HEIGHT_);
- ADD_SHAPE_CONFIG(LEFT_MARGIN, 16);
- ADD_SHAPE_CONFIG(TOP_MARGIN, 15);
+ ADD_SHAPE_CONFIG(LEFT_MARGIN, 26);
+ ADD_SHAPE_CONFIG(TOP_MARGIN, 0);
ADD_SHAPE_CONFIG(RIGHT_MARGIN, 26);
ADD_SHAPE_CONFIG(TITLE_FONT_SIZE, 50);
ADD_SHAPE_CONFIG(TITLE_FONT_SIZE_WITH_DESCRIPTION, 38);
ADD_SHAPE_CONFIG(TITLE_FONT_SIZE_WITH_SEGMENTED, 38);
ADD_SHAPE_CONFIG(DESCRIPTION_TEXT_FONT_SIZE, 28);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_FONT_SIZE, 27);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_MULTILINE_FONT_SIZE, 27);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_FONT_SIZE, 32);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_MULTILINE_FONT_SIZE, 32);
ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE, 30);
- ADD_SHAPE_CONFIG(SEGMENTED_ITEM_MULTILINE_FONT_SIZE, 28);
- ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE_3_ITEM, 26);
- ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE_4_ITEM, 24);
+ ADD_SHAPE_CONFIG(SEGMENTED_ITEM_MULTILINE_FONT_SIZE, 30);
+ ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE_3_ITEM, 30);
+ ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE_4_ITEM, 30);
ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE, 30);//1280x720
- ADD_SHAPE_CONFIG(TAB_ITEM_MULTILINE_FONT_SIZE, 28);
- ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE_3_ITEM, 26);
- ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE_4_ITEM, 24);
+ ADD_SHAPE_CONFIG(TAB_ITEM_MULTILINE_FONT_SIZE, 30);
+ ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE_3_ITEM, 30);
+ ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE_4_ITEM, 30);
ADD_SHAPE_CONFIG(BADGE_FONT_SIZE, 26);
ADD_SHAPE_CONFIG(BADGE_FONT_SIZE_WITH_BUTTON, 20);
ADD_SHAPE_CONFIG(BADGE_FONT_SIZE_WITH_BUTTON_2, 16);
- ADD_SHAPE_CONFIG(TITLE_DISPLAY_HEIGHT, 68);
- ADD_SHAPE_CONFIG(TITLE_TOP_MARGIN_WITH_DESCRIPTION, 11);
+ ADD_SHAPE_CONFIG(TITLE_DISPLAY_HEIGHT, 91);
+ ADD_SHAPE_CONFIG(TITLE_TOP_MARGIN_WITH_DESCRIPTION, 7.5);
ADD_SHAPE_CONFIG(TITLE_TOTAL_HEIGHT_WITH_SEGMENTED_ITEM, 145);
- ADD_SHAPE_CONFIG(TITLE_TOP_MARGIN_WITH_SEGMENTED_ITEM, 17);
- ADD_SHAPE_CONFIG(TITLE_HEIGHT_WITH_SEGMENTED_ITEM, 77);
- ADD_SHAPE_CONFIG(TITLE_DISPLAY_HEIGHT_WITH_SEGMENTED_ITEM, 60);
- ADD_SHAPE_CONFIG(DESCRIPTION_TEXT_HEIGHT, 32);
+ ADD_SHAPE_CONFIG(TITLE_TOP_MARGIN_WITH_SEGMENTED_ITEM, 0);
+ ADD_SHAPE_CONFIG(TITLE_HEIGHT_WITH_SEGMENTED_ITEM, 70);
+ ADD_SHAPE_CONFIG(TITLE_DISPLAY_HEIGHT_WITH_SEGMENTED_ITEM, 70);
+ ADD_SHAPE_CONFIG(DESCRIPTION_TEXT_HEIGHT, 30);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_WIDTH, 85);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_WIDTH_WITH_TEXT, 114);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_WIDTH, 115);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_WIDTH_WITH_TEXT, 124);
ADD_SHAPE_CONFIG(BUTTON_ITEM_HEIGHT, 91);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_GAP, 4);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_GAP, 2);
ADD_SHAPE_CONFIG(BUTTON_ITEM_TOP_MARGIN, 0);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_ICON_TOP_MARGIN, 17);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_ICON_TOP_MARGIN, 8);
ADD_SHAPE_CONFIG(BUTTON_ITEM_ICON_SIZE, 63);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_LEFT_TOUCH_MARGIN, 11);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_TOP_TOUCH_MARGIN, 17);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 11);
- ADD_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 10);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_LEFT_TOUCH_MARGIN, 0);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_TOP_TOUCH_MARGIN, 0);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 0);
+ ADD_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 0);
- ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_LEFT_TOUCH_MARGIN, 11);
- ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_TOP_TOUCH_MARGIN, 11);
- ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 11);
- ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 11);
+ ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_LEFT_TOUCH_MARGIN, 26);
+ ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_TOP_TOUCH_MARGIN, 14);
+ ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 26);
+ ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 14);
- ADD_SHAPE_CONFIG(SEGMENTED_ITEM_HEIGHT, 63);
+ ADD_SHAPE_CONFIG(SEGMENTED_ITEM_HEIGHT, 75);
ADD_SHAPE_CONFIG(TAB_ITEM_ICON_SIZE, 63);
ADD_SHAPE_CONFIG(TAB_ITEM_ICON_SIZE_WITH_TEXT, 45);
- ADD_SHAPE_CONFIG(TAB_LEFT_MARGIN, 34);
+ ADD_SHAPE_CONFIG(TAB_LEFT_MARGIN, 0);
ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_TOP_MARGIN, 0);//1280x720
- ADD_SHAPE_CONFIG(SIP_FOOTER_ITEM_TOP_MARGIN, 32);
+ ADD_SHAPE_CONFIG(SIP_FOOTER_ITEM_TOP_MARGIN, 14);
ADD_SHAPE_CONFIG(ICON_WIDTH, 45);
ADD_SHAPE_CONFIG(ICON_TEXT_GAP, 8);
- ADD_SHAPE_CONFIG(DIVIDER_WIDTH, 4);
- ADD_SHAPE_CONFIG(DIVIDER_HEIGHT, 26);
+ ADD_SHAPE_CONFIG(DIVIDER_WIDTH, 2);
+ ADD_SHAPE_CONFIG(DIVIDER_HEIGHT, 48);
ADD_SHAPE_CONFIG(BADGE_HEIGHT, 54);
ADD_SHAPE_CONFIG(BADGE_HEIGHT_WITH_BUTTON, 45);
ADD_SHAPE_CONFIG(TITLE_BADGE_ICON_GAP, 2);
ADD_SHAPE_CONFIG(TITLE_BADGE_TOP_MARGIN, 3);
- ADD_SHAPE_CONFIG(HEADER_ITEM_SELECTED_BITMAP_MARGIN, 16);
- ADD_SHAPE_CONFIG(HEADER_ITEM_SELECTED_BITMAP_HEIGHT, 3);
+ ADD_SHAPE_CONFIG(HEADER_ITEM_SELECTED_BITMAP_MARGIN, 0);
+ ADD_SHAPE_CONFIG(HEADER_ITEM_SELECTED_BITMAP_HEIGHT, 5);
ADD_SHAPE_CONFIG(PROCESSING_ANIMATION_ICON_SIZE, 36);
ADD_SHAPE_CONFIG(PROCESSING_ANIMATION_ICON_GAP, 16);
ADD_SHAPE_CONFIG(ITEM_MINIMUM_WIDTH, 60);
ADD_SHAPE_CONFIG(COMMON_MINIMUM_MARGIN, 8);
+ ADD_SHAPE_CONFIG(TAB_LARGE_HEIGHT, 126);
+
END_UI_CONFIG_MODE(1280x720);
}
END_UI_CONFIG(HEADER);
projects / platform / framework / native / uifw.git / commitdiff
