apply v5.0 and fix memleak

Change-Id: I6f2e38e3008bb8234fec8591e9f12f4552060d3f

diff --git a/src/ui/FUi_ResourceManager.cpp b/src/ui/FUi_ResourceManager.cpp
index a5bacef..b4b855e 100755 (executable)
--- a/src/ui/FUi_ResourceManager.cpp
+++ b/src/ui/FUi_ResourceManager.cpp
@@ -1350,7 +1350,7 @@ _ResourceManager::LoadBlackPalette(void)
        ADD_PALETTE(BASIC::B052L4P, 0xFFFAFAFA);
        ADD_PALETTE(BASIC::B052L4D, 0x66FAFAFA);
        ADD_PALETTE(BASIC::B052L5, 0xFFFAFAFA);
-       ADD_PALETTE(BASIC::B052L5D, 0x3FFAFAFA);
+       ADD_PALETTE(BASIC::B052L5D, 0x66FAFAFA);
        ADD_PALETTE(BASIC::B052L5P, 0xFF5D83FF);
        ADD_PALETTE(BASIC::B052L6, 0xFFFAFAFA);
        ADD_PALETTE(BASIC::B052L6D, 0x99FAFAFA);

diff --git a/src/ui/controls/FUiCtrl_Form.cpp b/src/ui/controls/FUiCtrl_Form.cpp
index 9309e96..f368a09 100644 (file)
--- a/src/ui/controls/FUiCtrl_Form.cpp
+++ b/src/ui/controls/FUiCtrl_Form.cpp
@@ -759,6 +759,7 @@ _Form::CreateSoftkey(unsigned long formStyle)
                        __pSoftkeyNormalIcon[_SOFTKEY_0] = null;
                }
                __pSoftkeyNormalIcon[_SOFTKEY_0] = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), softkeyNormalIconColor);
+               delete pTempBitmap;
 
                r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_ICON_ADD_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
                SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
@@ -769,6 +770,7 @@ _Form::CreateSoftkey(unsigned long formStyle)
                        __pSoftkeyDisabledIcon[_SOFTKEY_0] = null;
                }
                __pSoftkeyDisabledIcon[_SOFTKEY_0] = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), softkeyDisabledIconColor);
+               delete pTempBitmap;
 
                r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_ICON_ADD_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
                SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
@@ -779,6 +781,7 @@ _Form::CreateSoftkey(unsigned long formStyle)
                        __pSoftkeyPressedIcon[_SOFTKEY_0] = null;
                }
                __pSoftkeyPressedIcon[_SOFTKEY_0] = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), softkeyPressedIconColor);
+               delete pTempBitmap;
 
                r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_ICON_ADD_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
                SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
@@ -789,7 +792,6 @@ _Form::CreateSoftkey(unsigned long formStyle)
                        __pSoftkeyHighlightedIcon[_SOFTKEY_0] = null;
                }
                __pSoftkeyHighlightedIcon[_SOFTKEY_0] = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), softkeyHighlightedIconColor);
-
                delete pTempBitmap;
 
                _Button* pButton = _Button::CreateButtonN();
@@ -940,6 +942,7 @@ _Form::CreateSoftkey(unsigned long formStyle)
                        __pSoftkeyNormalIcon[_SOFTKEY_1] = null;
                }
                __pSoftkeyNormalIcon[_SOFTKEY_1] = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), softkeyNormalIconColor);
+               delete pTempBitmap;
 
                r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_ICON_ZOOM_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
                SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
@@ -950,7 +953,7 @@ _Form::CreateSoftkey(unsigned long formStyle)
                        __pSoftkeyDisabledIcon[_SOFTKEY_1] = null;
                }
                __pSoftkeyDisabledIcon[_SOFTKEY_1] = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), softkeyDisabledIconColor);
-
+               delete pTempBitmap;
 
                r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_ICON_ZOOM_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
                SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
@@ -961,6 +964,7 @@ _Form::CreateSoftkey(unsigned long formStyle)
                        __pSoftkeyPressedIcon[_SOFTKEY_1] = null;
                }
                __pSoftkeyPressedIcon[_SOFTKEY_1] = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), softkeyPressedIconColor);
+               delete pTempBitmap;
 
                r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_ICON_ZOOM_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
                SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
@@ -971,7 +975,6 @@ _Form::CreateSoftkey(unsigned long formStyle)
                        __pSoftkeyHighlightedIcon[_SOFTKEY_1] = null;
                }
                __pSoftkeyHighlightedIcon[_SOFTKEY_1] = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), softkeyHighlightedIconColor);
-
                delete pTempBitmap;
 
                _Button* pButton = _Button::CreateButtonN();

diff --git a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
index f559788..2f59231 100644 (file)
--- a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
@@ -2075,6 +2075,14 @@ _ToolbarPresenter::DrawTitleTextDimBitmap(void)
                return;
        }
 
+       Canvas* pCanvas = __pToolbar->GetCanvasN();
+
+       if (pCanvas == null)
+       {
+               SysLog(NID_UI_CTRL, "Cannot get a canvas.");
+               return;
+       }
+
        float textDimWidth = 0.0f;
        float textDimHeight = 0.0f;
        float leftMargin = 0.0f;
@@ -2111,7 +2119,6 @@ _ToolbarPresenter::DrawTitleTextDimBitmap(void)
 
        if (pReColorTitleTextDimLeftBitmap)
        {
-               Canvas* pCanvas = __pToolbar->GetCanvasN();
                FloatRectangle bounds = FloatRectangle(0.0f, 0.0f, textDimWidth, textDimHeight);
 
                if (__pToolbar->GetTitleIcon() != null)
@@ -2119,15 +2126,6 @@ _ToolbarPresenter::DrawTitleTextDimBitmap(void)
                        bounds.x += __titleRect.x;
                }
 
-               if (pCanvas == null)
-               {
-                       SysLog(NID_UI_CTRL, "Cannot get a canvas.");
-
-                       delete pReColorTitleTextDimLeftBitmap;
-
-                       return;
-               }
-
                if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pReColorTitleTextDimLeftBitmap))
                {
                        pCanvas->DrawNinePatchedBitmap(bounds, *pReColorTitleTextDimLeftBitmap);
@@ -2139,7 +2137,6 @@ _ToolbarPresenter::DrawTitleTextDimBitmap(void)
                }
 
                delete pReColorTitleTextDimLeftBitmap;
-               delete pCanvas;
        }
 
        Bitmap* pTitleTextDimRightBitmap = null;
@@ -2150,7 +2147,6 @@ _ToolbarPresenter::DrawTitleTextDimBitmap(void)
 
        if (pReColorTitleTextDimRightBitmap)
        {
-               Canvas* pCanvas = __pToolbar->GetCanvasN();
                FloatRectangle bounds = FloatRectangle(__titleRect.width, 0.0f, textDimWidth, textDimHeight);
 
                if (__pToolbar->GetTitleIcon() != null)
@@ -2158,14 +2154,6 @@ _ToolbarPresenter::DrawTitleTextDimBitmap(void)
                        bounds.x += (__titleRect.x - leftMargin);
                }
 
-               if (pCanvas == null)
-               {
-                       SysLog(NID_UI_CTRL, "Cannot get a canvas.");
-
-                       delete pReColorTitleTextDimRightBitmap;
-                       return;
-               }
-
                if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pReColorTitleTextDimRightBitmap))
                {
                        pCanvas->DrawNinePatchedBitmap(bounds, *pReColorTitleTextDimRightBitmap);
@@ -2177,9 +2165,10 @@ _ToolbarPresenter::DrawTitleTextDimBitmap(void)
                }
 
                delete pReColorTitleTextDimRightBitmap;
-               delete pCanvas;
        }
 
+       delete pCanvas;
+
        return;
 }
 

diff --git a/src/ui/resource/FUi_ResourceFooterConfig.cpp b/src/ui/resource/FUi_ResourceFooterConfig.cpp
index 4f387c6..2b42e0f 100644 (file)
--- a/src/ui/resource/FUi_ResourceFooterConfig.cpp
+++ b/src/ui/resource/FUi_ResourceFooterConfig.cpp
@@ -30,17 +30,17 @@ START_UI_CONFIG(FOOTER);
        // $B0543 is 0x00000000, transparent
        ADD_COLOR_CONFIG(BUTTON_BG_NORMAL, $B0515L1);
        ADD_COLOR_CONFIG(BUTTON_BG_DISABLED, $B0515L1);
-       ADD_COLOR_CONFIG(BUTTON_BG_PRESSED, $B0511P);
+       ADD_COLOR_CONFIG(BUTTON_BG_PRESSED, $B0515L1);
        ADD_COLOR_CONFIG(BUTTON_BG_HIGHLIGHTED, $W161);
 
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_NORMAL, $B013);
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_DISABLED, $B013);
-       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_PRESSED, $B013P);
+       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_PRESSED, $B013);
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_HIGHLIGHTED, $W161);
 
        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_DISABLED, $B052L5D);
+       ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L5P);
        ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L5);
 
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_NORMAL, $B052L8);

diff --git a/src/ui/resource/FUi_ResourceHeaderConfig.cpp b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
index 8c0900a..bf41f6a 100644 (file)
--- a/src/ui/resource/FUi_ResourceHeaderConfig.cpp
+++ b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
@@ -36,17 +36,17 @@ START_UI_CONFIG(HEADER);
        // $B0543 is 0x00000000, transparent
        ADD_COLOR_CONFIG(BUTTON_BG_NORMAL, $B0511);
        ADD_COLOR_CONFIG(BUTTON_BG_DISABLED, $B0511);
-       ADD_COLOR_CONFIG(BUTTON_BG_PRESSED, $B0511P);
+       ADD_COLOR_CONFIG(BUTTON_BG_PRESSED, $B0511);
        ADD_COLOR_CONFIG(BUTTON_BG_HIGHLIGHTED, $W161);
 
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_NORMAL, $B013);
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_DISABLED, $B013);
-       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_PRESSED, $B013P);
+       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_PRESSED, $B013);
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_HIGHLIGHTED, $W161);
 
        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_DISABLED, $B052L5D);
+       ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L5P);
        ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L5);
 
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_NORMAL, $B052L8);