From 5ab124315b0062487f314bbd748fb6f816c00f79 Mon Sep 17 00:00:00 2001 From: Chulheon Date: Wed, 28 Aug 2013 14:10:49 +0900 Subject: [PATCH] Applied new macro (GET_REPLACED_BITMAP_CONFIG_N) for only when using replacement color and not scaling the bitmap. Change-Id: I0076737d8956c35e48774c17ca662c9dd0898ee8 --- src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp | 45 ++++++++++-------------- src/ui/controls/FUiCtrl_EditPresenter.cpp | 37 +++++-------------- 2 files changed, 27 insertions(+), 55 deletions(-) diff --git a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp index 2c5600b..2a1e229 100644 --- a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp +++ b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp @@ -2117,56 +2117,47 @@ _EditCopyPasteManager::CreateCopyPastePopup(void) __pCopyPastePopup->AddActionEventListener(*this); return; /* - Bitmap* pSearchBitmap = null; - Bitmap* pReplacedSearchBitmap = null; - Bitmap* pReplacedSearchPressedBitmap = null; + Bitmap* pSearchNormalBitmap = null; + Bitmap* pSearchPressedBitmap = null; + Color searchColor; Color searchPressedColor; result r = E_SUCCESS; if (__pEdit->IsBlocked() && !isPasswordStyle) { - r = GET_BITMAP_CONFIG_N(EDIT::COPY_PASTE_SEARCH_ICON, BITMAP_PIXEL_FORMAT_ARGB8888, pSearchBitmap); - SysTryReturnVoidResult(NID_UI_CTRL, (r == E_SUCCESS), GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult())); - GET_COLOR_CONFIG(CONTEXTMENU::ITEM_TEXT_NORMAL, searchColor); GET_COLOR_CONFIG(CONTEXTMENU::ITEM_TEXT_PRESSED, searchPressedColor); - pReplacedSearchBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pSearchBitmap, Color::GetColor(COLOR_ID_MAGENTA), searchColor); - SysTryCatch(NID_UI_CTRL, pReplacedSearchBitmap, r = GetLastResult(), GetLastResult(),"[%s] Propagating.", GetErrorMessage(GetLastResult())); + r = GET_REPLACED_BITMAP_CONFIG_N(EDIT::COPY_PASTE_SEARCH_ICON, BITMAP_PIXEL_FORMAT_ARGB8888, searchColor, pSearchNormalBitmap); + SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), r, r,"[%s] Propagating.", GetErrorMessage(r)); - pReplacedSearchPressedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pSearchBitmap, Color::GetColor(COLOR_ID_MAGENTA), searchPressedColor); - SysTryCatch(NID_UI_CTRL, pReplacedSearchPressedBitmap, r = GetLastResult(), GetLastResult(),"[%s] Propagating.", GetErrorMessage(GetLastResult())); + r = GET_REPLACED_BITMAP_CONFIG_N(EDIT::COPY_PASTE_SEARCH_ICON, BITMAP_PIXEL_FORMAT_ARGB8888, searchPressedColor, pSearchPressedBitmap); + SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), r, r,"[%s] Propagating.", GetErrorMessage(r)); - __pCopyPastePopup->AddItem(null, COPY_PASTE_SEARCH_ID, pReplacedSearchBitmap, pReplacedSearchPressedBitmap, null); + __pCopyPastePopup->AddItem(null, COPY_PASTE_SEARCH_ID, pSearchNormalBitmap, pSearchPressedBitmap, null); } - if (pSearchBitmap) + if (pSearchNormalBitmap) { - delete pSearchBitmap; - pSearchBitmap = null; + delete pSearchNormalBitmap; + pSearchNormalBitmap = null; } - if (pReplacedSearchBitmap) - { - delete pReplacedSearchBitmap; - pReplacedSearchBitmap = null; - } - - if (pReplacedSearchPressedBitmap) + if (pSearchPressedBitmap) { - delete pReplacedSearchPressedBitmap; - pReplacedSearchPressedBitmap = null; + delete pSearchPressedBitmap; + pSearchPressedBitmap = null; } __pCopyPastePopup->AddActionEventListener(*this); return; CATCH: - delete pSearchBitmap; - pSearchBitmap = null; + delete pSearchNormalBitmap; + pSearchNormalBitmap = null; - delete pReplacedSearchBitmap; - pReplacedSearchBitmap = null; + delete pSearchPressedBitmap; + pSearchPressedBitmap = null; return; */ diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp index 70c9b80..d14efe6 100644 --- a/src/ui/controls/FUiCtrl_EditPresenter.cpp +++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp @@ -2354,50 +2354,42 @@ _EditPresenter::DrawClearIcon(Canvas& canvas) } Bitmap* pEditBitmapClear = null; - Bitmap* pEditReplacedBitmapClear = null; Color editClearIconColor; if (!__pEdit->IsEnabled()) { - r = GET_BITMAP_CONFIG_N(EDIT::CLEAR_ICON_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pEditBitmapClear); + GET_COLOR_CONFIG(EDIT::CLEAR_ICON_DISABLED, editClearIconColor); + r = GET_REPLACED_BITMAP_CONFIG_N(EDIT::CLEAR_ICON_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, editClearIconColor, pEditBitmapClear); if (pEditBitmapClear == null) { return E_SYSTEM; } - - GET_COLOR_CONFIG(EDIT::CLEAR_ICON_DISABLED, editClearIconColor); } else if (__isClearIconPressed) { - r = GET_BITMAP_CONFIG_N(EDIT::CLEAR_ICON_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pEditBitmapClear); + GET_COLOR_CONFIG(EDIT::CLEAR_ICON_PRESSED, editClearIconColor); + r = GET_REPLACED_BITMAP_CONFIG_N(EDIT::CLEAR_ICON_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, editClearIconColor, pEditBitmapClear); if (pEditBitmapClear == null) { return E_SYSTEM; } - - GET_COLOR_CONFIG(EDIT::CLEAR_ICON_PRESSED, editClearIconColor); } else { - r = GET_BITMAP_CONFIG_N(EDIT::CLEAR_ICON_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pEditBitmapClear); + GET_COLOR_CONFIG(EDIT::CLEAR_ICON_NORMAL, editClearIconColor); + r = GET_REPLACED_BITMAP_CONFIG_N(EDIT::CLEAR_ICON_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, editClearIconColor, pEditBitmapClear); if (pEditBitmapClear == null) { return E_SYSTEM; } - - GET_COLOR_CONFIG(EDIT::CLEAR_ICON_NORMAL, editClearIconColor); } FloatRectangle textRect = __textObjectBounds; FloatRectangle afterClearIconRect(textRect.x + textRect.width, textRect.y + (textRect.height - clearIconHeight) / 2.0f, clearIconWidth, clearIconHeight); FloatRectangle editBounds = __pEdit->GetBoundsF(); - pEditReplacedBitmapClear = _BitmapImpl::GetColorReplacedBitmapN(*pEditBitmapClear, Color::GetColor(COLOR_ID_MAGENTA), - editClearIconColor); - SysTryCatch(NID_UI_CTRL, pEditReplacedBitmapClear, , r = E_SYSTEM, "[E_SYSTEM] Unable to create an instance ."); - if (__clearIconBounds != afterClearIconRect) { __clearIconBounds = afterClearIconRect; @@ -2409,13 +2401,13 @@ _EditPresenter::DrawClearIcon(Canvas& canvas) __clearIconBounds.y = textRect.y; } - if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pEditReplacedBitmapClear)) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pEditBitmapClear)) { - r = canvas.DrawNinePatchedBitmap(__clearIconBounds, *pEditReplacedBitmapClear); + r = canvas.DrawNinePatchedBitmap(__clearIconBounds, *pEditBitmapClear); } else { - r = canvas.DrawBitmap(__clearIconBounds, *pEditReplacedBitmapClear); + r = canvas.DrawBitmap(__clearIconBounds, *pEditBitmapClear); } if (pEditBitmapClear) @@ -2424,17 +2416,6 @@ _EditPresenter::DrawClearIcon(Canvas& canvas) pEditBitmapClear = null; } - if (pEditReplacedBitmapClear) - { - delete pEditReplacedBitmapClear; - pEditReplacedBitmapClear = null; - } - - return r; - -CATCH: - delete pEditBitmapClear; - return r; } -- 2.7.4