From 53df45642040f2c1ffb49147e90ccc291ec103bb Mon Sep 17 00:00:00 2001 From: Myung Jin Kim Date: Thu, 4 Jul 2013 06:07:12 +0900 Subject: [PATCH] apply v4.8 gui Change-Id: Ib3f559cad1a22e55dd7ad3fa8f3a0c4bc24b991e --- src/graphics/inc/FGrp_TextTextObject.h | 3 ++ src/graphics/text/FGrp_TextTextObject.cpp | 13 +++++++ src/ui/controls/FUiCtrl_Button.cpp | 35 +++++++++++++++++ src/ui/controls/FUiCtrl_ButtonPresenter.cpp | 45 +++++++++++++++++++++- src/ui/controls/FUiCtrl_HeaderImpl.cpp | 41 +++++++++----------- src/ui/controls/FUiCtrl_Toolbar.cpp | 56 ++++++++++++++++++++++++--- src/ui/controls/FUiCtrl_ToolbarPresenter.cpp | 31 +++++++++++++++ src/ui/inc/FUiCtrl_Button.h | 4 ++ src/ui/inc/FUiCtrl_ButtonPresenter.h | 1 + src/ui/inc/FUi_ResourceHeaderConfig.h | 3 ++ src/ui/resource/FUi_ResourceFooterConfig.cpp | 56 +++++++++++++-------------- src/ui/resource/FUi_ResourceHeaderConfig.cpp | 57 +++++++++++++++------------- 12 files changed, 260 insertions(+), 85 deletions(-) diff --git a/src/graphics/inc/FGrp_TextTextObject.h b/src/graphics/inc/FGrp_TextTextObject.h index 09e1cdc..f030f31 100644 --- a/src/graphics/inc/FGrp_TextTextObject.h +++ b/src/graphics/inc/FGrp_TextTextObject.h @@ -383,6 +383,8 @@ public: result RemoveText(int textIndex); + int GetRepeatCount(void) const; + private: result DrawByLine(_CanvasImpl& canvasImpl, const Rectangle& displayRect); @@ -468,6 +470,7 @@ private: bool __isPhoneNumberLinkColorDefined; Color __linkColor[TEXT_OBJECT_LINK_COLOR_TYPE_MAX]; TextBidiHint __bidiHint; + int __repeatCount; TextObjectSweepInfo __sweepInfo; diff --git a/src/graphics/text/FGrp_TextTextObject.cpp b/src/graphics/text/FGrp_TextTextObject.cpp index d4ddbe8..9b60925 100644 --- a/src/graphics/text/FGrp_TextTextObject.cpp +++ b/src/graphics/text/FGrp_TextTextObject.cpp @@ -85,6 +85,7 @@ TextObject::TextObject(void) __rect.y = 0; __rect.width = 0; __rect.height = 0; + __repeatCount = 0; __slidingGap = CoordinateSystem::ConvertToLogicalX(30.0f); __slidingStep = CoordinateSystem::ConvertToLogicalX(2.0f); __linkViewModeEnabled = false; @@ -612,6 +613,8 @@ TextObject::DrawWithOffset(_CanvasImpl& canvasImpl) else { slidingStartIndex += slidingDim.width + __slidingGap; + + __repeatCount++; } } else @@ -1087,6 +1090,8 @@ TextObject::SetAction(TextObjectActionType action) __action = action; UpdateChangedInfo(0, 0); } + + __repeatCount = 0; } bool isAbbreviationEnable = (__action == TEXT_OBJECT_ACTION_TYPE_ABBREV) ? true : false; @@ -4828,4 +4833,12 @@ TextObject::IsDisplayBoundsExpandEnabled(void) const return __isDisplayBoundsExpandEnabled; } +int +TextObject::GetRepeatCount(void) const +{ + IF_NOT_CONSTRUCTED(return -1); + + return __repeatCount; +} + }}} // Tizen::Graphics::_Text diff --git a/src/ui/controls/FUiCtrl_Button.cpp b/src/ui/controls/FUiCtrl_Button.cpp index 4ca33b7..a8f0bb0 100644 --- a/src/ui/controls/FUiCtrl_Button.cpp +++ b/src/ui/controls/FUiCtrl_Button.cpp @@ -102,6 +102,7 @@ _Button::_Button() __pUnderlineBitmap = null; __pTabTextDimLeftBitmap = null; __pTabTextDimRightBitmap = null; + __pSubTitleEffectBitmap = null; GET_COLOR_CONFIG(BUTTON::BG_NORMAL, __color[_BUTTON_STATUS_NORMAL]); GET_COLOR_CONFIG(BUTTON::BG_DISABLED, __color[_BUTTON_STATUS_DISABLED]); @@ -221,6 +222,12 @@ _Button::~_Button(void) __pTabTextDimRightBitmap = null; } + if (__pSubTitleEffectBitmap) + { + delete __pSubTitleEffectBitmap; + __pSubTitleEffectBitmap = null; + } + if (__pTextElement) { __pTextElement->Activate(false); @@ -1030,6 +1037,34 @@ _Button::GetTabTextDimRightBitmap(void) const } result +_Button::SetSubTitleEffectBitmap(const Bitmap& bitmap) +{ + result r = E_SYSTEM; + + Bitmap* pClonedBitmap = _BitmapImpl::CloneN(bitmap); + + if (pClonedBitmap) + { + if (__pSubTitleEffectBitmap != null) + { + delete __pSubTitleEffectBitmap; + } + + __pSubTitleEffectBitmap = pClonedBitmap; + + r = E_SUCCESS; + } + + return r; +} + +Bitmap* +_Button::GetSubTitleEffectBitmap(void) const +{ + return __pSubTitleEffectBitmap; +} + +result _Button::SetBackgroundBitmap(_ButtonStatus status, const Bitmap& bitmap) { result r = E_SYSTEM; diff --git a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp index d5d7a63..c83daab 100644 --- a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp @@ -295,6 +295,7 @@ _ButtonPresenter::Draw(void) DrawBackground(); } + DrawSubTitleEffectBitmap(); DrawBitmap(); if (!__pButton->GetText().IsEmpty()) @@ -951,6 +952,45 @@ _ButtonPresenter::DrawUnderlineBitmap(void) return; } +void +_ButtonPresenter::DrawSubTitleEffectBitmap(void) +{ + float leftTouchMargin = __pButton->GetLeftTouchMarginF(); + float topTouchMargin = __pButton->GetTopTouchMarginF(); + float rightTouchMargin = __pButton->GetRightTouchMarginF(); + float bottomTouchMargin = __pButton->GetBottomTouchMarginF(); + + Bitmap* pSubTitleEffectBitmap = __pButton->GetSubTitleEffectBitmap(); + + if (pSubTitleEffectBitmap) + { + Canvas* pCanvas = __pButton->GetCanvasN(); + + if (pCanvas == null) + { + SysLog(NID_UI_CTRL, "Cannot get a canvas."); + return; + } + + FloatRectangle bounds(leftTouchMargin, topTouchMargin, + __pButton->GetBoundsF().width - (leftTouchMargin + rightTouchMargin), __pButton->GetBoundsF().height - (topTouchMargin + bottomTouchMargin)); + + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pSubTitleEffectBitmap)) + { + pCanvas->DrawNinePatchedBitmap(bounds, *pSubTitleEffectBitmap); + } + else + { + pCanvas->DrawBitmap(bounds, *pSubTitleEffectBitmap, + FloatRectangle(0.0f, 0.0f, pSubTitleEffectBitmap->GetWidthF(), pSubTitleEffectBitmap->GetHeightF())); + } + + delete pCanvas; + } + + return; +} + bool _ButtonPresenter::OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo) { @@ -1382,7 +1422,10 @@ _ButtonPresenter::TimerForTitleSlideTimeout(void) DrawTabTextDimBitmap(); - TimerForTitleSlideStart(); + if (__pTextObject->GetRepeatCount() < 3) + { + TimerForTitleSlideStart(); + } } else { diff --git a/src/ui/controls/FUiCtrl_HeaderImpl.cpp b/src/ui/controls/FUiCtrl_HeaderImpl.cpp index cfe7cd9..dfa1a10 100644 --- a/src/ui/controls/FUiCtrl_HeaderImpl.cpp +++ b/src/ui/controls/FUiCtrl_HeaderImpl.cpp @@ -1122,38 +1122,31 @@ _HeaderImpl::ConvertButtonItem(const ButtonItem& buttonItem) GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_WIDTH, GetCore().GetOrientation(), buttonItemWidth); GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_MARGIN_WITH_TEXT, GetCore().GetOrientation(), textMargin); - if (__style == HEADER_STYLE_TITLE || __style == HEADER_STYLE_TITLE_BUTTON) + if (buttonItem.GetText() != L"") { - if (buttonItem.GetText() != L"") - { - pButton->SetBounds(FloatRectangle(0.0f, 0.0f, buttonItemWidth, buttonItemHeight)); - - float extentSize = 0.0f; - float extentSizeMax = 0.0f; - float extentSizeMin = 0.0f; - - GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_WIDTH_WITH_TEXT, GetCore().GetOrientation(), extentSizeMax); - GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_WIDTH, GetCore().GetOrientation(), extentSizeMin); + pButton->SetBounds(FloatRectangle(0.0f, 0.0f, buttonItemWidth, buttonItemHeight)); - extentSize = pButton->GetTextExtentSizeF() + textMargin * 2; + float extentSize = 0.0f; + float extentSizeMax = 0.0f; + float extentSizeMin = 0.0f; - if (extentSize > extentSizeMax) - { - extentSize = extentSizeMax; - } + GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_WIDTH_WITH_TEXT, GetCore().GetOrientation(), extentSizeMax); + GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_WIDTH, GetCore().GetOrientation(), extentSizeMin); - if (extentSize < extentSizeMin) - { - extentSize = extentSizeMin; - } + extentSize = pButton->GetTextExtentSizeF() + textMargin * 2; - pButton->SetMargin(textMargin, 0.0f, textMargin, 0.0f); - pButton->SetBounds(FloatRectangle(0.0f, 0.0f, extentSize, buttonItemHeight)); + if (extentSize > extentSizeMax) + { + extentSize = extentSizeMax; } - else + + if (extentSize < extentSizeMin) { - pButton->SetBounds(FloatRectangle(0.0f, 0.0f, buttonItemWidth, buttonItemHeight)); + extentSize = extentSizeMin; } + + pButton->SetMargin(textMargin, 0.0f, textMargin, 0.0f); + pButton->SetBounds(FloatRectangle(0.0f, 0.0f, extentSize, buttonItemHeight)); } else { diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp index 3474e90..49a5edb 100644 --- a/src/ui/controls/FUiCtrl_Toolbar.cpp +++ b/src/ui/controls/FUiCtrl_Toolbar.cpp @@ -373,7 +373,7 @@ _Toolbar::InitToolbarColor(void) __itemTransBackgroundColor[_BUTTON_STATUS_NORMAL].SetAlpha(0x00); __itemTransBackgroundColor[_BUTTON_STATUS_DISABLED].SetAlpha(0x00); - __itemTransBackgroundColor[_BUTTON_STATUS_PRESSED].SetAlpha(0xFF); + __itemTransBackgroundColor[_BUTTON_STATUS_PRESSED].SetAlpha(0x7F); __itemTransBackgroundColor[_BUTTON_STATUS_HIGHLIGHTED].SetAlpha(0x00); __itemTransBackgroundColor[_BUTTON_STATUS_SELECTED].SetAlpha(0x00); @@ -384,7 +384,7 @@ _Toolbar::InitToolbarColor(void) __buttonTransBackgroundColor[_BUTTON_STATUS_NORMAL].SetAlpha(0x00); __buttonTransBackgroundColor[_BUTTON_STATUS_DISABLED].SetAlpha(0x00); - __buttonTransBackgroundColor[_BUTTON_STATUS_PRESSED].SetAlpha(0x00); + __buttonTransBackgroundColor[_BUTTON_STATUS_PRESSED].SetAlpha(0x7F); __buttonTransBackgroundColor[_BUTTON_STATUS_HIGHLIGHTED].SetAlpha(0x00); GET_COLOR_CONFIG(HEADER::BUTTON_TRANSLUCENT_TEXT_NORMAL, __buttonTransTextColor[_BUTTON_STATUS_NORMAL]); @@ -614,7 +614,7 @@ _Toolbar::InitToolbarColor(void) __itemTransBackgroundColor[_BUTTON_STATUS_NORMAL].SetAlpha(0x00); __itemTransBackgroundColor[_BUTTON_STATUS_DISABLED].SetAlpha(0x00); - __itemTransBackgroundColor[_BUTTON_STATUS_PRESSED].SetAlpha(0xFF); + __itemTransBackgroundColor[_BUTTON_STATUS_PRESSED].SetAlpha(0x7F); __itemTransBackgroundColor[_BUTTON_STATUS_HIGHLIGHTED].SetAlpha(0x00); __itemTransBackgroundColor[_BUTTON_STATUS_SELECTED].SetAlpha(0x00); @@ -626,7 +626,7 @@ _Toolbar::InitToolbarColor(void) __buttonTransBackgroundColor[_BUTTON_STATUS_NORMAL].SetAlpha(0x00); __buttonTransBackgroundColor[_BUTTON_STATUS_DISABLED].SetAlpha(0x00); - __buttonTransBackgroundColor[_BUTTON_STATUS_PRESSED].SetAlpha(0x00); + __buttonTransBackgroundColor[_BUTTON_STATUS_PRESSED].SetAlpha(0x7F); __buttonTransBackgroundColor[_BUTTON_STATUS_HIGHLIGHTED].SetAlpha(0x00); GET_COLOR_CONFIG(FOOTER::BUTTON_TRANSLUCENT_TEXT_NORMAL, __buttonTransTextColor[_BUTTON_STATUS_NORMAL]); @@ -5832,6 +5832,27 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton) // delete pHighlightedBackgroundEffectBitmap; //} } + + if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE) + { + Bitmap* pSubTitleEffectBitmap = null; + Bitmap* pReColorSubTitleEffectBitmap = null; + + Color subTitleEffectColor; + + GET_BITMAP_CONFIG_N(HEADER::SUB_TITLE_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, pSubTitleEffectBitmap); + GET_COLOR_CONFIG(HEADER::SUB_TITLE_EFFECT_NORMAL, subTitleEffectColor); + + pReColorSubTitleEffectBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pSubTitleEffectBitmap, Color::GetColor(COLOR_ID_MAGENTA), subTitleEffectColor); + + if (pReColorSubTitleEffectBitmap) + { + pButton->SetSubTitleEffectBitmap(*pReColorSubTitleEffectBitmap); + } + + delete pSubTitleEffectBitmap; + delete pReColorSubTitleEffectBitmap; + } } else if (TOOLBAR_ITEM == buttonType) { @@ -6473,10 +6494,12 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton) if (__transparent == true) { GET_COLOR_CONFIG(HEADER::TAB_TEXT_DIM_TRANSLUCENT_NORMAL, tabTextDimColor); + tabTextDimColor.SetAlpha(0x00); } else { GET_COLOR_CONFIG(HEADER::TAB_TEXT_DIM_NORMAL, tabTextDimColor); + tabTextDimColor.SetAlpha(0x00); } } else @@ -6486,10 +6509,12 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton) if (__transparent == true) { GET_COLOR_CONFIG(FOOTER::TAB_TEXT_DIM_TRANSLUCENT_NORMAL, tabTextDimColor); + tabTextDimColor.SetAlpha(0x00); } else { GET_COLOR_CONFIG(FOOTER::TAB_TEXT_DIM_NORMAL, tabTextDimColor); + tabTextDimColor.SetAlpha(0x00); } } @@ -6511,7 +6536,28 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton) delete pReColorTabTextDimLeftBitmap; delete pReColorTabTextDimRightBitmap; } - } + + if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE) + { + Bitmap* pSubTitleEffectBitmap = null; + Bitmap* pReColorSubTitleEffectBitmap = null; + + Color subTitleEffectColor; + + GET_BITMAP_CONFIG_N(HEADER::SUB_TITLE_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, pSubTitleEffectBitmap); + GET_COLOR_CONFIG(HEADER::SUB_TITLE_EFFECT_NORMAL, subTitleEffectColor); + + pReColorSubTitleEffectBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pSubTitleEffectBitmap, Color::GetColor(COLOR_ID_MAGENTA), subTitleEffectColor); + + if (pReColorSubTitleEffectBitmap) + { + pButton->SetSubTitleEffectBitmap(*pReColorSubTitleEffectBitmap); + } + + delete pSubTitleEffectBitmap; + delete pReColorSubTitleEffectBitmap; + } + } //if (TOOLBAR_ITEM == buttonType) return E_SUCCESS; } diff --git a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp index d081770..920d7a9 100644 --- a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp @@ -496,6 +496,37 @@ _ToolbarPresenter::DrawBackground(void) //} } + if (style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || style == TOOLBAR_TAB_WITH_TITLE) + { + Bitmap* pSubTitleEffectBitmap = null; + Color subTitleEffectColor; + float topMargin = 0.0f; + + GET_BITMAP_CONFIG_N(HEADER::SUB_TITLE_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, pSubTitleEffectBitmap); + GET_COLOR_CONFIG(HEADER::SUB_TITLE_EFFECT_NORMAL, subTitleEffectColor); + GET_SHAPE_CONFIG(HEADER::TITLE_HEIGHT_WITH_SEGMENTED_ITEM, __pToolbar->GetOrientation(), topMargin); + + FloatRectangle subTitleEffectBounds(0.0f, topMargin, __pToolbar->GetBoundsF().width, __pToolbar->GetBoundsF().height - topMargin); + + Bitmap* pReColorSubTitleEffectBitmap = null; + + pReColorSubTitleEffectBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pSubTitleEffectBitmap, Color::GetColor(COLOR_ID_MAGENTA), subTitleEffectColor); + + if (pReColorSubTitleEffectBitmap) + { + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pReColorSubTitleEffectBitmap)) + { + pCanvas->DrawNinePatchedBitmap(subTitleEffectBounds, *pReColorSubTitleEffectBitmap); + } + else + { + pCanvas->DrawBitmap(subTitleEffectBounds, *pReColorSubTitleEffectBitmap, FloatRectangle(0.0f, 0.0f, pReColorSubTitleEffectBitmap->GetWidthF(), pReColorSubTitleEffectBitmap->GetHeightF())); + } + } + + delete pReColorSubTitleEffectBitmap; + } + delete pCanvas; delete pReplacementColorBackgroundBitmap; diff --git a/src/ui/inc/FUiCtrl_Button.h b/src/ui/inc/FUiCtrl_Button.h index 054b0f9..ad0232d 100644 --- a/src/ui/inc/FUiCtrl_Button.h +++ b/src/ui/inc/FUiCtrl_Button.h @@ -194,6 +194,9 @@ public: result SetTabTextDimRightBitmap(const Tizen::Graphics::Bitmap& bitmap); Tizen::Graphics::Bitmap* GetTabTextDimRightBitmap(void) const; + result SetSubTitleEffectBitmap(const Tizen::Graphics::Bitmap& bitmap); + Tizen::Graphics::Bitmap* GetSubTitleEffectBitmap(void) const; + result SetBackgroundBitmap(_ButtonStatus status, const Tizen::Graphics::Bitmap& bitmap); Tizen::Graphics::Bitmap* GetBackgroundBitmap(_ButtonStatus status) const; @@ -307,6 +310,7 @@ private: Tizen::Graphics::Bitmap* __pUnderlineBitmap; Tizen::Graphics::Bitmap* __pTabTextDimLeftBitmap; Tizen::Graphics::Bitmap* __pTabTextDimRightBitmap; + Tizen::Graphics::Bitmap* __pSubTitleEffectBitmap; HorizontalAlignment __horizontalAlignment; VerticalAlignment __verticalAlignment; diff --git a/src/ui/inc/FUiCtrl_ButtonPresenter.h b/src/ui/inc/FUiCtrl_ButtonPresenter.h index 6ef34ee..51cff52 100644 --- a/src/ui/inc/FUiCtrl_ButtonPresenter.h +++ b/src/ui/inc/FUiCtrl_ButtonPresenter.h @@ -107,6 +107,7 @@ private: void DrawText(void); void DrawUnderlineBitmap(void); void DrawTabTextDimBitmap(void); + void DrawSubTitleEffectBitmap(void); bool IsEnabledStateChanged(void); diff --git a/src/ui/inc/FUi_ResourceHeaderConfig.h b/src/ui/inc/FUi_ResourceHeaderConfig.h index e4c0c61..2115906 100644 --- a/src/ui/inc/FUi_ResourceHeaderConfig.h +++ b/src/ui/inc/FUi_ResourceHeaderConfig.h @@ -120,6 +120,7 @@ DECLARE_UI_CONFIG(HEADER); DECLARE_COLOR_CONFIG(BOUNCING_EFFECT, 93); DECLARE_COLOR_CONFIG(TAB_TEXT_DIM_NORMAL, 94); DECLARE_COLOR_CONFIG(TAB_TEXT_DIM_TRANSLUCENT_NORMAL, 95); + DECLARE_COLOR_CONFIG(SUB_TITLE_EFFECT_NORMAL, 96); // BITMAP DECLARE_IMAGE_CONFIG(BG_NORMAL, 1); @@ -209,6 +210,8 @@ DECLARE_UI_CONFIG(HEADER); DECLARE_IMAGE_CONFIG(TAB_TEXT_DIM_EFFECT_LEFT, 78); DECLARE_IMAGE_CONFIG(TAB_TEXT_DIM_EFFECT_RIGHT, 79); + DECLARE_IMAGE_CONFIG(SUB_TITLE_EFFECT, 80); + DECLARE_ANIMATION_CONFIG(PROCESSING_ANIMATION, 1); DECLARE_SHAPE_CONFIG(HEIGHT, 1); diff --git a/src/ui/resource/FUi_ResourceFooterConfig.cpp b/src/ui/resource/FUi_ResourceFooterConfig.cpp index b1317cc..eb86ed5 100644 --- a/src/ui/resource/FUi_ResourceFooterConfig.cpp +++ b/src/ui/resource/FUi_ResourceFooterConfig.cpp @@ -38,10 +38,10 @@ START_UI_CONFIG(FOOTER); ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_PRESSED, $B013P); ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_HIGHLIGHTED, $W161); - ADD_COLOR_CONFIG(BUTTON_TEXT_NORMAL, $B052L4); - ADD_COLOR_CONFIG(BUTTON_TEXT_DISABLED, $B052L4D); - ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L4P); - ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L4); + ADD_COLOR_CONFIG(BUTTON_TEXT_NORMAL, $B052L5); + ADD_COLOR_CONFIG(BUTTON_TEXT_DISABLED, $B052L6D); + ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L6P2); + ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L5); ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_NORMAL, $B052L8); ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_DISABLED, $B052L8D); @@ -52,60 +52,60 @@ START_UI_CONFIG(FOOTER); ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_NORMAL, $B0515L1); ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_DISABLED, $B0515L1); ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_PRESSED, $B0511P); - ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_HIGHLIGHTED, $W161); + ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_HIGHLIGHTED, $B0514P2); ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_SELECTED, $B0515L1); ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_NORMAL, $B013); ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_DISABLED, $B013); - ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_PRESSED, $B013); - ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, $W161); + ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_PRESSED, $B013P); + ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, $B0514P2); ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_SELECTED, $B013); ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_NORMAL, $B052L6); - ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_DISABLED, $B052L6); - ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_PRESSED, $B052L6); + ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_DISABLED, $B052L6D); + ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_PRESSED, $B052L6P2); ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_HIGHLIGHTED, $B052L6); - ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_SELECTED, $B052L6P); + ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_SELECTED, $B052L6P1); ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8); - ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8); - ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8); + ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8D); + ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8P); ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED, $B052L8); ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_SELECTED, $B052L8); ADD_COLOR_CONFIG(TAB_ITEM_BG_NORMAL, $B0515L1); ADD_COLOR_CONFIG(TAB_ITEM_BG_DISABLED, $B0515L1); ADD_COLOR_CONFIG(TAB_ITEM_BG_PRESSED, $B0511P); - ADD_COLOR_CONFIG(TAB_ITEM_BG_HIGHLIGHTED, $W161); + ADD_COLOR_CONFIG(TAB_ITEM_BG_HIGHLIGHTED, $B0514P2); ADD_COLOR_CONFIG(TAB_ITEM_BG_SELECTED, $B0515L1); ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_BG_NORMAL, $B013); ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_BG_DISABLED, $B013); - ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_BG_PRESSED, $B013); - ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, $W161); + ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_BG_PRESSED, $B013P); + ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, $B0514P2); ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_BG_SELECTED, $B013); ADD_COLOR_CONFIG(TAB_ITEM_TEXT_NORMAL, $B052L6); - ADD_COLOR_CONFIG(TAB_ITEM_TEXT_DISABLED, $B052L6); - ADD_COLOR_CONFIG(TAB_ITEM_TEXT_PRESSED, $B052L6); + ADD_COLOR_CONFIG(TAB_ITEM_TEXT_DISABLED, $B052L6D); + ADD_COLOR_CONFIG(TAB_ITEM_TEXT_PRESSED, $B052L6P2); ADD_COLOR_CONFIG(TAB_ITEM_TEXT_HIGHLIGHTED, $B052L6); - ADD_COLOR_CONFIG(TAB_ITEM_TEXT_SELECTED, $B052L6P); + ADD_COLOR_CONFIG(TAB_ITEM_TEXT_SELECTED, $B052L6P1); ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8); ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8D); - ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8); + ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8P); ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED, $B052L8); ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_SELECTED, $B052L8); ADD_COLOR_CONFIG(BUTTON_ITEM_BG_NORMAL, $B0515L1); ADD_COLOR_CONFIG(BUTTON_ITEM_BG_DISABLED, $B0515L1); ADD_COLOR_CONFIG(BUTTON_ITEM_BG_PRESSED, $B0511P); - ADD_COLOR_CONFIG(BUTTON_ITEM_BG_HIGHLIGHTED, $W161); + ADD_COLOR_CONFIG(BUTTON_ITEM_BG_HIGHLIGHTED, $B0514P2); ADD_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_NORMAL, $B013); ADD_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_DISABLED, $B013); - ADD_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_PRESSED, $B042); - ADD_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, $W161); + ADD_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_PRESSED, $B013P); + ADD_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, $B0514P2); ADD_COLOR_CONFIG(BUTTON_ITEM_TEXT_NORMAL, $B052L4); ADD_COLOR_CONFIG(BUTTON_ITEM_TEXT_DISABLED, $B052L4D); @@ -140,20 +140,20 @@ START_UI_CONFIG(FOOTER); ADD_COLOR_CONFIG(SOFTKEY_ICON_HIGHLIGHTED, $B052L8); ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_NORMAL, $B0221); - ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_NORMAL, $B0222); + ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_NORMAL, $B0221); - ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_TRANSLUCENT_NORMAL, $B0227); - ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_TRANSLUCENT_NORMAL, $B0228); + ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_TRANSLUCENT_NORMAL, $B0221); + ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_TRANSLUCENT_NORMAL, $B0221); ADD_COLOR_CONFIG(MORE_ICON_NORMAL, $B052L1); ADD_COLOR_CONFIG(MORE_ICON_DISABLED, $B052L1D); ADD_COLOR_CONFIG(MORE_ICON_PRESSED, $B052L1P); ADD_COLOR_CONFIG(MORE_ICON_HIGHLIGHTED, $B052L1); - ADD_COLOR_CONFIG(SELECTED_BAR_BG_NORMAL, $B052L6P); - ADD_COLOR_CONFIG(SELECTED_BAR_TRANSLUCENT_BG_NORMAL, $B052L6P); + ADD_COLOR_CONFIG(SELECTED_BAR_BG_NORMAL, $B052L1P); + ADD_COLOR_CONFIG(SELECTED_BAR_TRANSLUCENT_BG_NORMAL, $B052L1P); - ADD_COLOR_CONFIG(TAB_TEXT_DIM_NORMAL, $B0515L1); + ADD_COLOR_CONFIG(TAB_TEXT_DIM_NORMAL, $B0514); ADD_COLOR_CONFIG(TAB_TEXT_DIM_TRANSLUCENT_NORMAL, $B013); // BITMAP diff --git a/src/ui/resource/FUi_ResourceHeaderConfig.cpp b/src/ui/resource/FUi_ResourceHeaderConfig.cpp index 3b6b223..60c9509 100644 --- a/src/ui/resource/FUi_ResourceHeaderConfig.cpp +++ b/src/ui/resource/FUi_ResourceHeaderConfig.cpp @@ -44,10 +44,10 @@ START_UI_CONFIG(HEADER); ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_PRESSED, $B013P); ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_HIGHLIGHTED, $W161); - ADD_COLOR_CONFIG(BUTTON_TEXT_NORMAL, $B052L4); - ADD_COLOR_CONFIG(BUTTON_TEXT_DISABLED, $B052L4D); - ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L4P); - ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L4); + ADD_COLOR_CONFIG(BUTTON_TEXT_NORMAL, $B052L5); + ADD_COLOR_CONFIG(BUTTON_TEXT_DISABLED, $B052L6D); + ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L6P2); + ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L5); ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_NORMAL, $B052L8); ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_DISABLED, $B052L8D); @@ -57,60 +57,60 @@ START_UI_CONFIG(HEADER); 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_HIGHLIGHTED, $B0514P2); 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_BG_PRESSED, $B013); - ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, $W161); + ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_PRESSED, $B013P); + ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, $B0514P2); ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_SELECTED, $B013); ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_NORMAL, $B052L6); - ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_DISABLED, $B052L6); - ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_PRESSED, $B052L6); + ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_DISABLED, $B052L6D); + ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_PRESSED, $B052L6P2); ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_HIGHLIGHTED, $B052L6); - ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_SELECTED, $B052L6P); + ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_SELECTED, $B052L6P1); ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8); ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8D); - ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8); + ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8P); ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED, $B052L8); ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_SELECTED, $B052L8); 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_HIGHLIGHTED, $B0514P2); 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_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_BG_PRESSED, $B013); - ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, $W161); + ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_BG_PRESSED, $B013P); + ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, $B0514P2); ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_BG_SELECTED, $B013); ADD_COLOR_CONFIG(TAB_ITEM_TEXT_NORMAL, $B052L6); - ADD_COLOR_CONFIG(TAB_ITEM_TEXT_DISABLED, $B052L6); - ADD_COLOR_CONFIG(TAB_ITEM_TEXT_PRESSED, $B052L6); + ADD_COLOR_CONFIG(TAB_ITEM_TEXT_DISABLED, $B052L6D); + ADD_COLOR_CONFIG(TAB_ITEM_TEXT_PRESSED, $B052L6P2); ADD_COLOR_CONFIG(TAB_ITEM_TEXT_HIGHLIGHTED, $B052L6); - ADD_COLOR_CONFIG(TAB_ITEM_TEXT_SELECTED, $B052L6P); + ADD_COLOR_CONFIG(TAB_ITEM_TEXT_SELECTED, $B052L6P1); ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8); ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8D); - ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8); + ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8P); ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED, $B052L8); ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_SELECTED, $B052L8); ADD_COLOR_CONFIG(BUTTON_ITEM_BG_NORMAL, $B0511); ADD_COLOR_CONFIG(BUTTON_ITEM_BG_DISABLED, $B0511); ADD_COLOR_CONFIG(BUTTON_ITEM_BG_PRESSED, $B0514P1); - ADD_COLOR_CONFIG(BUTTON_ITEM_BG_HIGHLIGHTED, $W161); + ADD_COLOR_CONFIG(BUTTON_ITEM_BG_HIGHLIGHTED, $B0514P2); ADD_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_NORMAL, $B013); ADD_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_DISABLED, $B013); - ADD_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_PRESSED, $B042); - ADD_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, $W161); + ADD_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_PRESSED, $B013P); + ADD_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, $B0514P2); ADD_COLOR_CONFIG(BUTTON_ITEM_TEXT_NORMAL, $B052L4); ADD_COLOR_CONFIG(BUTTON_ITEM_TEXT_DISABLED, $B052L4D); @@ -126,19 +126,21 @@ START_UI_CONFIG(HEADER); ADD_COLOR_CONFIG(BADGE_ICON_TEXT_NORMAL, $B052L7); ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_NORMAL, $B0221); - ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_NORMAL, $B0222); + ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_NORMAL, $B0221); - ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_TRANSLUCENT_NORMAL, $B0227); - ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_TRANSLUCENT_NORMAL, $B0228); + ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_TRANSLUCENT_NORMAL, $B0221); + ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_TRANSLUCENT_NORMAL, $B0221); - ADD_COLOR_CONFIG(SELECTED_BAR_BG_NORMAL, $B052L6P); - ADD_COLOR_CONFIG(SELECTED_BAR_TRANSLUCENT_BG_NORMAL, $B052L6P); + ADD_COLOR_CONFIG(SELECTED_BAR_BG_NORMAL, $B052L1P); + ADD_COLOR_CONFIG(SELECTED_BAR_TRANSLUCENT_BG_NORMAL, $B052L1P); ADD_COLOR_CONFIG(BOUNCING_EFFECT, $B018); - ADD_COLOR_CONFIG(TAB_TEXT_DIM_NORMAL, $B0511); + ADD_COLOR_CONFIG(TAB_TEXT_DIM_NORMAL, $B0514); ADD_COLOR_CONFIG(TAB_TEXT_DIM_TRANSLUCENT_NORMAL, $B013); + ADD_COLOR_CONFIG(SUB_TITLE_EFFECT_NORMAL, $B0511); + // BITMAP ADD_IMAGE_CONFIG(BG_NORMAL, #00_title_bg.#.png); ADD_IMAGE_CONFIG(TRANSLUCENT_BG_NORMAL, #00_title_bg.#.png); @@ -231,6 +233,7 @@ START_UI_CONFIG(HEADER); ADD_IMAGE_CONFIG(TAB_TEXT_DIM_EFFECT_LEFT, #00_effect_tab_text_dim_left.#.png); ADD_IMAGE_CONFIG(TAB_TEXT_DIM_EFFECT_RIGHT, #00_effect_tab_text_dim_right.#.png); + ADD_IMAGE_CONFIG(SUB_TITLE_EFFECT, #00_sub_title_ef.#.png); START_ANIMATION_CONFIG(PROCESSING_ANIMATION); ADD_ANIMATION_FRAME(#00_header_process_01.png, 16); -- 2.7.4