From 488dee5dd50dd447995f8d8eb9aa2a3e92b94b37 Mon Sep 17 00:00:00 2001 From: "jaewon7.cho" Date: Sat, 23 Mar 2013 15:06:51 +0900 Subject: [PATCH] Change nine-patched bitmap checking logic - IsNinePatchedBitmap() -> _BitmapImpl::CheckNinePatchedBitmapStrictly() Change-Id: Ib9254e4f9854b144395e6cf70a168b787bebabc3 Signed-off-by: jaewon7.cho --- src/ui/FUi_AccessibilityManager.cpp | 3 +- src/ui/FUi_Control.cpp | 6 +-- src/ui/FUi_ResourceManager.cpp | 2 +- src/ui/controls/FUiCtrl_AnimationPresenter.cpp | 3 +- src/ui/controls/FUiCtrl_ButtonPresenter.cpp | 52 +++++++++++----------- src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp | 8 ++-- src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp | 2 +- .../controls/FUiCtrl_ContextMenuGridPresenter.cpp | 3 +- .../controls/FUiCtrl_ContextMenuListPresenter.cpp | 2 +- src/ui/controls/FUiCtrl_CustomListElements.cpp | 2 +- src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp | 4 +- src/ui/controls/FUiCtrl_DateTimeDisplayBox.cpp | 8 ++-- src/ui/controls/FUiCtrl_DateTimePresenter.cpp | 4 +- src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp | 4 +- src/ui/controls/FUiCtrl_EditPresenter.cpp | 10 ++--- src/ui/controls/FUiCtrl_EditTimePresenter.cpp | 2 +- src/ui/controls/FUiCtrl_ExpandableListImpl.cpp | 4 +- src/ui/controls/FUiCtrl_FastScrollIndex.cpp | 2 +- src/ui/controls/FUiCtrl_FastScrollPresenter.cpp | 11 +++-- src/ui/controls/FUiCtrl_GalleryRenderer.cpp | 3 +- .../controls/FUiCtrl_GroupContainerPresenter.cpp | 4 +- src/ui/controls/FUiCtrl_IconListItem.cpp | 14 +++--- src/ui/controls/FUiCtrl_IconListPresenter.cpp | 4 +- src/ui/controls/FUiCtrl_LabelPresenter.cpp | 4 +- src/ui/controls/FUiCtrl_ListViewItem.cpp | 2 +- src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp | 5 ++- src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp | 2 +- src/ui/controls/FUiCtrl_PanelPresenter.cpp | 6 +-- src/ui/controls/FUiCtrl_PopupPresenter.cpp | 4 +- src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp | 4 +- src/ui/controls/FUiCtrl_ProgressPresenter.cpp | 2 +- src/ui/controls/FUiCtrl_ScrollPresenter.cpp | 2 +- src/ui/controls/FUiCtrl_SearchBarPresenter.cpp | 8 ++-- src/ui/controls/FUiCtrl_SliderOverlay.cpp | 4 +- src/ui/controls/FUiCtrl_SliderPresenter.cpp | 4 +- src/ui/controls/FUiCtrl_TabBarPresenter.cpp | 2 +- src/ui/controls/FUiCtrl_TabPresenter.cpp | 2 +- src/ui/controls/FUiCtrl_TableViewItem.cpp | 6 +-- src/ui/controls/FUiCtrl_TokenEditPresenter.cpp | 6 +-- src/ui/controls/FUiCtrl_ToolbarPresenter.cpp | 6 +-- 40 files changed, 115 insertions(+), 111 deletions(-) mode change 100644 => 100755 src/ui/FUi_AccessibilityManager.cpp mode change 100644 => 100755 src/ui/FUi_Control.cpp mode change 100644 => 100755 src/ui/FUi_ResourceManager.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_AnimationPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_ButtonPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_ContextMenuListPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_CustomListElements.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_DateTimeDisplayBox.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_DateTimePresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_EditPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_EditTimePresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_ExpandableListImpl.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_FastScrollIndex.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_FastScrollPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_GalleryRenderer.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_GroupContainerPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_LabelPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_ListViewItem.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_PanelPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_PopupPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_ProgressPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_ScrollPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_SearchBarPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_SliderOverlay.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_SliderPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_TabBarPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_TabPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_TableViewItem.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_TokenEditPresenter.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_ToolbarPresenter.cpp diff --git a/src/ui/FUi_AccessibilityManager.cpp b/src/ui/FUi_AccessibilityManager.cpp old mode 100644 new mode 100755 index 39ead74..7eee982 --- a/src/ui/FUi_AccessibilityManager.cpp +++ b/src/ui/FUi_AccessibilityManager.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include "FUi_AccessibilityGesture.h" #include "FUi_AccessibilitySystemSettingLoader.h" #include "FUi_AccessibilityTtsPlayer.h" @@ -1716,7 +1717,7 @@ _AccessibilityManager::DrawFocusUi(const _AccessibilityElement& element) result r = GET_BITMAP_CONFIG_N(ACCESSIBILITY::FOCUS, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap); if (r == E_SUCCESS) { - if (pBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBitmap)) { r = pCanvas->DrawNinePatchedBitmap(Rectangle(0, 0, rectangle.width, rectangle.height), *pBitmap); SysTryCatch(NID_UI, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] System error"); diff --git a/src/ui/FUi_Control.cpp b/src/ui/FUi_Control.cpp old mode 100644 new mode 100755 index 13cf641..72a15df --- a/src/ui/FUi_Control.cpp +++ b/src/ui/FUi_Control.cpp @@ -29,7 +29,8 @@ #include #include #include -#include "FSys_SystemInfoImpl.h" +#include +#include #include "FUi_Control.h" #include "FUi_ControlManager.h" #include "FUi_CoordinateSystemUtils.h" @@ -51,7 +52,6 @@ #include "FUiAnim_VisualElementImpl.h" #include "FUiCtrl_Form.h" #include "FUiCtrl_Frame.h" -#include "FGrp_BitmapImpl.h" using namespace std; using namespace Tizen::Base; @@ -4900,7 +4900,7 @@ _Control::OnDrawFocus(void) if (r == E_SUCCESS) { - if (pBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBitmap)) { r = pCanvas->DrawNinePatchedBitmap(FloatRectangle(0.0f, 0.0f, rectangle.width, rectangle.height), *pBitmap); } diff --git a/src/ui/FUi_ResourceManager.cpp b/src/ui/FUi_ResourceManager.cpp old mode 100644 new mode 100755 index 9a3f937..35047c0 --- a/src/ui/FUi_ResourceManager.cpp +++ b/src/ui/FUi_ResourceManager.cpp @@ -666,7 +666,7 @@ _ResourceManager::GetBitmapInternalN(const String& fileName, BitmapPixelFormat p } if(pTempBitmap != null) { - if(pTempBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pTempBitmap)) { pBitmap = pTempBitmap; r = E_SUCCESS; diff --git a/src/ui/controls/FUiCtrl_AnimationPresenter.cpp b/src/ui/controls/FUiCtrl_AnimationPresenter.cpp old mode 100644 new mode 100755 index 66028b4..c9fb08c --- a/src/ui/controls/FUiCtrl_AnimationPresenter.cpp +++ b/src/ui/controls/FUiCtrl_AnimationPresenter.cpp @@ -22,6 +22,7 @@ #include #include +#include #include "FUiCtrl_AnimationPresenter.h" #include "FUiCtrl_Animation.h" #include "FUiCtrl_AnimationModel.h" @@ -367,7 +368,7 @@ _AnimationPresenter::Draw(void) pCanvas->SetBackgroundColor(Color()); pCanvas->Clear(); - if (pBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBitmap)) { r = pCanvas->DrawNinePatchedBitmap(FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height), *pBitmap); } diff --git a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp old mode 100644 new mode 100755 index 6d8820c..72bf14c --- a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp @@ -300,8 +300,8 @@ _ButtonPresenter::DrawBackground(void) Bitmap* pReplacementColorBackgroundBitmap = null; Bitmap* pBackgroundBitmap = null; Bitmap* pBackgroundEffectBitmap = null; - //Color bgColor = __pButton->GetBackgroundColor(); - //String imagePath = L""; + Color bgColor = __pButton->GetBackgroundColor(); + String imagePath = L""; float leftTouchMargin = __pButton->GetLeftTouchMarginF(); float topTouchMargin = __pButton->GetTopTouchMarginF(); @@ -320,19 +320,19 @@ _ButtonPresenter::DrawBackground(void) if (pBackgroundBitmap) { - //if (pBackgroundBitmap->IsNinePatchedBitmap() == false) - //{ - // imagePath = _BitmapImpl::GetInstance(*pBackgroundBitmap)->GetFileName(); - //} - - //if (imagePath.IsEmpty() == false && __pButton->GetText() == L"" && __pButton->GetBitmap(status) == null) - //{ - // __pBase->SetBackgroundColor(_Colorf( - // (float)bgColor.GetRed() / 255, (float)bgColor.GetGreen() / 255, (float)bgColor.GetBlue() / 255, (float)bgColor.GetAlpha() / 255)); - // __pBase->SetImageSource(imagePath); - //} - //else - //{ + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap) == false) + { + imagePath = _BitmapImpl::GetInstance(*pBackgroundBitmap)->GetFileName(); + } + + if (imagePath.IsEmpty() == false && __pButton->GetText() == L"" && __pButton->GetBitmap(status) == null) + { + __pBase->SetBackgroundColor(_Colorf( + (float)bgColor.GetRed() / 255, (float)bgColor.GetGreen() / 255, (float)bgColor.GetBlue() / 255, (float)bgColor.GetAlpha() / 255)); + __pBase->SetImageSource(imagePath); + } + else + { pCanvas = __pButton->GetCanvasN(); if (pCanvas == null) { @@ -342,11 +342,11 @@ _ButtonPresenter::DrawBackground(void) pCanvas->SetBackgroundColor(Color(0, 0, 0, 0)); pCanvas->Clear(); - if (pBackgroundBitmap->IsNinePatchedBitmap()) // pBackgroundBitmap is 9 + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap))// pBackgroundBitmap is 9 { if (pBackgroundEffectBitmap) { - if (pBackgroundEffectBitmap->IsNinePatchedBitmap()) // 9,9 + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundEffectBitmap)) // 9,9 { pCanvas->DrawNinePatchedBitmap(_CoordinateSystemUtils::ConvertToInteger(bounds), *pBackgroundBitmap); if (__pButton->IsUserBackgroundEffectBitmap(status)) @@ -373,7 +373,7 @@ _ButtonPresenter::DrawBackground(void) { if (pBackgroundEffectBitmap) { - if (pBackgroundEffectBitmap->IsNinePatchedBitmap()) // 0, 9 + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundEffectBitmap)) // 0, 9 { pCanvas->DrawBitmap(_CoordinateSystemUtils::ConvertToInteger(bounds), *pBackgroundBitmap, _CoordinateSystemUtils::ConvertToInteger(FloatRectangle(0.0f, 0.0f, pBackgroundBitmap->GetWidthF(), pBackgroundBitmap->GetHeightF()))); @@ -399,7 +399,7 @@ _ButtonPresenter::DrawBackground(void) _CoordinateSystemUtils::ConvertToInteger(FloatRectangle(0.0f, 0.0f, pBackgroundBitmap->GetWidthF(), pBackgroundBitmap->GetHeightF()))); } } - //} + } } else // pBackgroundBitmap is null { @@ -414,7 +414,7 @@ _ButtonPresenter::DrawBackground(void) if (pBackgroundEffectBitmap) { - if (pBackgroundEffectBitmap->IsNinePatchedBitmap()) // X, 9 + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundEffectBitmap)) // X, 9 { if (__pButton->IsUserBackgroundEffectBitmap(status)) { @@ -469,11 +469,11 @@ _ButtonPresenter::DrawBackground(void) if (pReplacementColorBackgroundBitmap) { - if (pReplacementColorBackgroundBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pReplacementColorBackgroundBitmap)) { if (pBackgroundEffectBitmap) { - if (pBackgroundEffectBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundEffectBitmap)) { pCanvas->DrawNinePatchedBitmap(_CoordinateSystemUtils::ConvertToInteger(bounds), *pReplacementColorBackgroundBitmap); pCanvas->DrawNinePatchedBitmap(_CoordinateSystemUtils::ConvertToInteger(bounds), *pBackgroundEffectBitmap); @@ -494,7 +494,7 @@ _ButtonPresenter::DrawBackground(void) { if (pBackgroundEffectBitmap) { - if (pBackgroundEffectBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundEffectBitmap)) { pCanvas->DrawBitmap(_CoordinateSystemUtils::ConvertToInteger(bounds), *pReplacementColorBackgroundBitmap, _CoordinateSystemUtils::ConvertToInteger(FloatRectangle(0.0f, 0.0f, pReplacementColorBackgroundBitmap->GetWidthF(), pReplacementColorBackgroundBitmap->GetHeightF()))); @@ -519,7 +519,7 @@ _ButtonPresenter::DrawBackground(void) { if (pBackgroundEffectBitmap) { - if (pBackgroundEffectBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundEffectBitmap)) { pCanvas->DrawNinePatchedBitmap(_CoordinateSystemUtils::ConvertToInteger(bounds), *pBackgroundEffectBitmap); } @@ -590,7 +590,7 @@ _ButtonPresenter::DrawToolbarItemBackground(void) FloatRectangle bounds(leftTouchMargin, topTouchMargin, __pButton->GetBoundsF().width - (leftTouchMargin + rightTouchMargin), __pButton->GetBoundsF().height - (topTouchMargin + bottomTouchMargin)); - if (pToolbarItemBackgroundBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pToolbarItemBackgroundBitmap)) { pCanvas->DrawNinePatchedBitmap(_CoordinateSystemUtils::ConvertToInteger(bounds), *pToolbarItemBackgroundBitmap); } @@ -822,7 +822,7 @@ _ButtonPresenter::DrawToolbarSelectedBitmap(void) bounds.y -= (selectedBitmapHeight - bottomTouchMargin); } - if (pToolbarSelectedBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pToolbarSelectedBitmap)) { pCanvas->DrawNinePatchedBitmap(_CoordinateSystemUtils::ConvertToInteger(bounds), *pToolbarSelectedBitmap); } diff --git a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp old mode 100644 new mode 100755 index 61872f9..47b61ac --- a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp +++ b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp @@ -238,7 +238,7 @@ _CheckButtonPresenter::DrawBackground(void) } else { - if (pBackgroundBitmap && pBackgroundBitmap->IsNinePatchedBitmap()) + if (pBackgroundBitmap && _BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap)) { pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA), __pCheckButton->GetColor(CHECK_BUTTON_STATUS_NORMAL)); @@ -269,7 +269,7 @@ _CheckButtonPresenter::DrawBackground(void) } else { - if (pBackgroundBitmap && pBackgroundBitmap->IsNinePatchedBitmap()) + if (pBackgroundBitmap && _BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap)) { pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA), __pCheckButton->GetColor(CHECK_BUTTON_STATUS_DISABLED)); @@ -300,7 +300,7 @@ _CheckButtonPresenter::DrawBackground(void) } else { - if (pBackgroundBitmap && pBackgroundBitmap->IsNinePatchedBitmap()) + if (pBackgroundBitmap && _BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap)) { pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA), __pCheckButton->GetColor(CHECK_BUTTON_STATUS_PRESSED)); @@ -331,7 +331,7 @@ _CheckButtonPresenter::DrawBackground(void) } else { - if (pBackgroundBitmap && pBackgroundBitmap->IsNinePatchedBitmap()) + if (pBackgroundBitmap && _BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap)) { pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA), __pCheckButton->GetColor(CHECK_BUTTON_STATUS_HIGHLIGHTED)); diff --git a/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp b/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp old mode 100644 new mode 100755 index 96451a6..25cf649 --- a/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp @@ -1367,7 +1367,7 @@ _ColorPickerPresenter::DrawResourceBitmap(Canvas& canvas, const FloatRectangle& SysTryReturn(NID_UI_CTRL, pBitmap != null, E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] Invalid argument is used. Provided bitmap is null."); - if (pBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBitmap)) { r = canvas.DrawNinePatchedBitmap(bounds, *pBitmap); SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp b/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp old mode 100644 new mode 100755 index a6ffc00..9e9f1b9 --- a/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp @@ -21,6 +21,7 @@ #include #include +#include #include #include #include "FUi_AccessibilityContainer.h" @@ -1548,7 +1549,7 @@ result _ContextMenuGridPresenter::DrawBitmap(Tizen::Graphics::Canvas& canvas, const Tizen::Graphics::FloatRectangle& bounds, const Tizen::Graphics::Bitmap& bitmap) { result r = E_SUCCESS; - if (bitmap.IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(bitmap)) { r = canvas.DrawNinePatchedBitmap(bounds, bitmap); SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Fail to draw ninepatched bitmap.") diff --git a/src/ui/controls/FUiCtrl_ContextMenuListPresenter.cpp b/src/ui/controls/FUiCtrl_ContextMenuListPresenter.cpp old mode 100644 new mode 100755 index ccf45a2..4b51888 --- a/src/ui/controls/FUiCtrl_ContextMenuListPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ContextMenuListPresenter.cpp @@ -1119,7 +1119,7 @@ result _ContextMenuListPresenter::DrawBitmap(Tizen::Graphics::Canvas& canvas, const Tizen::Graphics::FloatRectangle& bounds, const Tizen::Graphics::Bitmap& bitmap) { result r = E_SUCCESS; - if (bitmap.IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(bitmap)) { r = canvas.DrawNinePatchedBitmap(bounds, bitmap); SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Fail to draw ninepatched bitmap.") diff --git a/src/ui/controls/FUiCtrl_CustomListElements.cpp b/src/ui/controls/FUiCtrl_CustomListElements.cpp old mode 100644 new mode 100755 index 8510876..9e402ad --- a/src/ui/controls/FUiCtrl_CustomListElements.cpp +++ b/src/ui/controls/FUiCtrl_CustomListElements.cpp @@ -502,7 +502,7 @@ _BitmapElementView::OnDraw(void) pCanvas->SetBackgroundColor(Color(0, 0, 0, 0)); pCanvas->Clear(); - if (pBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBitmap)) { pCanvas->DrawNinePatchedBitmap(Rectangle(0, 0, GetWidth(), GetHeight()), *pBitmap); } diff --git a/src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp b/src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp old mode 100644 new mode 100755 index 6d56798..362ab32 --- a/src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp +++ b/src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp @@ -335,7 +335,7 @@ _DateTimeBarPresenter::DrawBackground(Canvas& canvas) if (__pBgColorReplacementBitmap != null) { - if (__pBgColorReplacementBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*__pBgColorReplacementBitmap)) { r = canvas.DrawNinePatchedBitmap(bodyAreaBounds, *__pBgColorReplacementBitmap); SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); @@ -364,7 +364,7 @@ _DateTimeBarPresenter::DrawArrow(Canvas& canvas) if (__pArrowColorReplacementBitmap != null) { - if (__pArrowColorReplacementBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*__pArrowColorReplacementBitmap)) { r = canvas.DrawNinePatchedBitmap(arrowAreaBounds, *__pArrowColorReplacementBitmap); SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); diff --git a/src/ui/controls/FUiCtrl_DateTimeDisplayBox.cpp b/src/ui/controls/FUiCtrl_DateTimeDisplayBox.cpp old mode 100644 new mode 100755 index c3f6a65..259a3e6 --- a/src/ui/controls/FUiCtrl_DateTimeDisplayBox.cpp +++ b/src/ui/controls/FUiCtrl_DateTimeDisplayBox.cpp @@ -180,7 +180,7 @@ _DateTimeDisplayBox::DrawBackground(Canvas& canvas, DateTimePickerStatus status) return; } - if (__pBackgroundNormalBitmap[status]->IsNinePatchedBitmap() == true) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*__pBackgroundNormalBitmap[status])) { r = canvas.DrawNinePatchedBitmap(__windowBounds, *__pBackgroundNormalBitmap[status]); SysTryReturnVoidResult(NID_UI_CTRL, (r == E_SUCCESS), r, "[%s] Propagating.", GetErrorMessage(r)); @@ -193,7 +193,7 @@ _DateTimeDisplayBox::DrawBackground(Canvas& canvas, DateTimePickerStatus status) if (status == DATETIME_STATUS_FOCUSED && __pBackgroundPressedEffectBitmap != null ) { - if (__pBackgroundEffectBitmap->IsNinePatchedBitmap() == true) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*__pBackgroundEffectBitmap)) { r = canvas.DrawNinePatchedBitmap(__windowBounds, *__pBackgroundPressedEffectBitmap); SysTryReturnVoidResult(NID_UI_CTRL, (r == E_SUCCESS), r, "[%s] Propagating.", GetErrorMessage(r)); @@ -206,7 +206,7 @@ _DateTimeDisplayBox::DrawBackground(Canvas& canvas, DateTimePickerStatus status) } else if (status == DATETIME_STATUS_DISABLED && __pBackgroundDisabledEffectBitmap != null) { - if (__pBackgroundDisabledEffectBitmap->IsNinePatchedBitmap() == true) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*__pBackgroundDisabledEffectBitmap)) { r = canvas.DrawNinePatchedBitmap(__windowBounds, *__pBackgroundDisabledEffectBitmap); SysTryReturnVoidResult(NID_UI_CTRL, (r == E_SUCCESS), r, "[%s] Propagating.", GetErrorMessage(r)); @@ -219,7 +219,7 @@ _DateTimeDisplayBox::DrawBackground(Canvas& canvas, DateTimePickerStatus status) } else if (__pBackgroundEffectBitmap != null) { - if (__pBackgroundEffectBitmap->IsNinePatchedBitmap() == true) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*__pBackgroundEffectBitmap)) { r = canvas.DrawNinePatchedBitmap(__windowBounds, *__pBackgroundEffectBitmap); SysTryReturnVoidResult(NID_UI_CTRL, (r == E_SUCCESS), r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/ui/controls/FUiCtrl_DateTimePresenter.cpp b/src/ui/controls/FUiCtrl_DateTimePresenter.cpp old mode 100644 new mode 100755 index c466a2f..7aec176 --- a/src/ui/controls/FUiCtrl_DateTimePresenter.cpp +++ b/src/ui/controls/FUiCtrl_DateTimePresenter.cpp @@ -1343,7 +1343,7 @@ _DateTimePresenter::DrawBackground(Canvas& canvas) if (__pBgEffectBitmap) { - if (__pBgEffectBitmap->IsNinePatchedBitmap() == true) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*__pBgEffectBitmap)) { canvas.DrawNinePatchedBitmap(bounds, *__pBgEffectBitmap); SysTryReturnVoidResult(NID_UI_CTRL, (r == E_SUCCESS), r, "[%s] Propagating.", GetErrorMessage(r)); @@ -1357,7 +1357,7 @@ _DateTimePresenter::DrawBackground(Canvas& canvas) if (__pBgNormalBitmap) { - if (__pBgNormalBitmap->IsNinePatchedBitmap() == true) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*__pBgNormalBitmap)) { canvas.DrawNinePatchedBitmap(bounds, *__pBgNormalBitmap); SysTryReturnVoidResult(NID_UI_CTRL, (r == E_SUCCESS), r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp old mode 100644 new mode 100755 index 4e680be..5c90a91 --- a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp +++ b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp @@ -423,7 +423,7 @@ _EditCopyPasteHandler::OnDraw(void) pCanvas->Clear(); if (__isTouchPressed) { - if (__pHandlerPressedBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*__pHandlerPressedBitmap)) { pCanvas->DrawNinePatchedBitmap(pCanvas->GetBoundsF(), *__pHandlerPressedBitmap); } @@ -434,7 +434,7 @@ _EditCopyPasteHandler::OnDraw(void) } else { - if (__pHandlerBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*__pHandlerBitmap)) { pCanvas->DrawNinePatchedBitmap(pCanvas->GetBoundsF(), *__pHandlerBitmap); } diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp old mode 100644 new mode 100755 index 06dca4d..884cf00 --- a/src/ui/controls/FUiCtrl_EditPresenter.cpp +++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp @@ -1321,7 +1321,7 @@ _EditPresenter::DrawChangeableBackground(Canvas& canvas, bool focused, int bitma pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pEditBgBitmap, Color::GetColor(COLOR_ID_MAGENTA), bitmapColor); if (pReplacementColorBackgroundBitmap) { - if (pReplacementColorBackgroundBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pReplacementColorBackgroundBitmap)) { canvas.DrawNinePatchedBitmap(editRect, *pReplacementColorBackgroundBitmap); } @@ -1344,7 +1344,7 @@ _EditPresenter::DrawChangeableBackground(Canvas& canvas, bool focused, int bitma if (pEditBgEffectBitmap) { - if (pEditBgEffectBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pEditBgEffectBitmap)) { canvas.DrawNinePatchedBitmap(editRect, *pEditBgEffectBitmap); } @@ -1396,7 +1396,7 @@ _EditPresenter::DrawBackground(Canvas& canvas, bool drawTitleText) if (pEditBgBitmap) { - if (pEditBgBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pEditBgBitmap)) { canvas.DrawNinePatchedBitmap(editRect, *pEditBgBitmap); } @@ -1793,7 +1793,7 @@ _EditPresenter::DrawSingleLineBackground(Canvas& canvas, bool drawTitleText) if (pEditBgBitmap) { - if (pEditBgBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pEditBgBitmap)) { canvas.DrawNinePatchedBitmap(editField, *pEditBgBitmap); } @@ -1905,7 +1905,7 @@ _EditPresenter::DrawClearIcon(Canvas& canvas) __clearIconBounds.y = textRect.y; } - if (pEditReplacedBitmapClear->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pEditReplacedBitmapClear)) { r = canvas.DrawNinePatchedBitmap(__clearIconBounds, *pEditReplacedBitmapClear); } diff --git a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp old mode 100644 new mode 100755 index aaac77c..d3b71ff --- a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp +++ b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp @@ -481,7 +481,7 @@ _EditTimePresenter::DrawResourceBitmap(Canvas& canvas, const FloatRectangle& bou return r; } - if (pBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBitmap)) { r = canvas.DrawNinePatchedBitmap(bounds, *pBitmap); SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/ui/controls/FUiCtrl_ExpandableListImpl.cpp b/src/ui/controls/FUiCtrl_ExpandableListImpl.cpp old mode 100644 new mode 100755 index 2bb1021..daf79b8 --- a/src/ui/controls/FUiCtrl_ExpandableListImpl.cpp +++ b/src/ui/controls/FUiCtrl_ExpandableListImpl.cpp @@ -282,7 +282,7 @@ _ExpandableListArrowBitmap::OnDraw(void) const Rectangle bounds = GetBounds(); - if (__pNormalBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*__pNormalBitmap)) { r = pCanvas->DrawNinePatchedBitmap(Rectangle(0, 0, bounds.width, bounds.height), *__pNormalBitmap); } @@ -295,7 +295,7 @@ _ExpandableListArrowBitmap::OnDraw(void) if (__pEffectBitmap != null) { - if (__pEffectBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*__pEffectBitmap)) { r = pCanvas->DrawNinePatchedBitmap(Rectangle(0, 0, bounds.width, bounds.height), *__pEffectBitmap); } diff --git a/src/ui/controls/FUiCtrl_FastScrollIndex.cpp b/src/ui/controls/FUiCtrl_FastScrollIndex.cpp old mode 100644 new mode 100755 index cc89b8e..d3c5c9f --- a/src/ui/controls/FUiCtrl_FastScrollIndex.cpp +++ b/src/ui/controls/FUiCtrl_FastScrollIndex.cpp @@ -22,8 +22,8 @@ #include #include +#include #include "FUiCtrl_FastScrollIndex.h" -#include "FGrp_BitmapImpl.h" namespace Tizen { namespace Ui { namespace Controls { diff --git a/src/ui/controls/FUiCtrl_FastScrollPresenter.cpp b/src/ui/controls/FUiCtrl_FastScrollPresenter.cpp old mode 100644 new mode 100755 index a80c2ec..ca3dd39 --- a/src/ui/controls/FUiCtrl_FastScrollPresenter.cpp +++ b/src/ui/controls/FUiCtrl_FastScrollPresenter.cpp @@ -33,9 +33,8 @@ #include #include #include - #include -#include "FGrp_BitmapImpl.h" +#include #include "FGrp_TextTextObject.h" #include #include "FUiAnim_VisualElement.h" @@ -1187,7 +1186,7 @@ result _FastScrollIndexView::DrawBitmap(Canvas& canvas, const FloatRectangle& bounds, const Bitmap& bitmap) { result r = E_SUCCESS; - if (bitmap.IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(bitmap)) { r = canvas.DrawNinePatchedBitmap(bounds, bitmap); SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Failed to draw ninepathced bitmap"); @@ -1205,7 +1204,7 @@ result _FastScrollIndexView::DrawBitmap(Canvas& canvas, const FloatRectangle& srcRect, const Bitmap& bitmap, const FloatRectangle& dstRect) { result r = E_SUCCESS; - if (bitmap.IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(bitmap)) { r = canvas.DrawNinePatchedBitmap(srcRect, bitmap); SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Failed to draw ninepathced bitmap"); @@ -1855,7 +1854,7 @@ result _FastScrollPopupView::DrawBitmap(Canvas& canvas, const FloatRectangle& bounds, const Bitmap& bitmap) { result r = E_SUCCESS; - if (bitmap.IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(bitmap)) { r = canvas.DrawNinePatchedBitmap(bounds, bitmap); SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Failed to draw ninepathced bitmap"); @@ -1873,7 +1872,7 @@ result _FastScrollPopupView::DrawBitmap(Canvas& canvas, const FloatRectangle& srcRect, const Bitmap& bitmap, const FloatRectangle& dstRect) { result r = E_SUCCESS; - if (bitmap.IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(bitmap)) { r = canvas.DrawNinePatchedBitmap(srcRect, bitmap); SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Failed to draw ninepathced bitmap"); diff --git a/src/ui/controls/FUiCtrl_GalleryRenderer.cpp b/src/ui/controls/FUiCtrl_GalleryRenderer.cpp old mode 100644 new mode 100755 index 428c1da..115c0c2 --- a/src/ui/controls/FUiCtrl_GalleryRenderer.cpp +++ b/src/ui/controls/FUiCtrl_GalleryRenderer.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -772,7 +773,7 @@ _GalleryRenderer::ShowEmptyImageAndText(void) if (pImage != null) { - if (pImage->GetInternalBitmap()->IsNinePatchedBitmap() == true) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*(pImage->GetInternalBitmap()))) { FloatDimension size = pImage->GetSize(); FloatRectangle rect(imagePosition.x, imagePosition.y, size.width, size.height); diff --git a/src/ui/controls/FUiCtrl_GroupContainerPresenter.cpp b/src/ui/controls/FUiCtrl_GroupContainerPresenter.cpp old mode 100644 new mode 100755 index 16bf48c..713a3a0 --- a/src/ui/controls/FUiCtrl_GroupContainerPresenter.cpp +++ b/src/ui/controls/FUiCtrl_GroupContainerPresenter.cpp @@ -182,7 +182,7 @@ _GroupContainerPresenter::DrawBackgroundBitmapForSystemChild(Canvas* pCanvas) if(__pBgColorReplacementBitmap != null) { - if (__pBgColorReplacementBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*__pBgColorReplacementBitmap)) { r = pCanvas->DrawNinePatchedBitmap(bounds, *__pBgColorReplacementBitmap); SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r)); @@ -207,7 +207,7 @@ _GroupContainerPresenter::DrawBackgroundEffectBitmapForSystemChild(Canvas* pCanv if(__pBgEffectColorReplacementBitmap != null) { - if (__pBgEffectColorReplacementBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*__pBgEffectColorReplacementBitmap)) { r = pCanvas->DrawNinePatchedBitmap(bounds, *__pBgEffectColorReplacementBitmap); SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/ui/controls/FUiCtrl_IconListItem.cpp b/src/ui/controls/FUiCtrl_IconListItem.cpp index 936654a..edb1857 100755 --- a/src/ui/controls/FUiCtrl_IconListItem.cpp +++ b/src/ui/controls/FUiCtrl_IconListItem.cpp @@ -428,7 +428,7 @@ _IconListItem::DrawBitmap(Canvas& canvas, Bitmap& bitmap, bool isFocused, float if (__pProperty->GetFocusDropShadowBitmap() != null && _FloatCompareGE(ratio, REFERENCE_FACTOR)) { const Bitmap* pShadowBitmap = __pProperty->GetFocusDropShadowBitmap(); - if (pShadowBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pShadowBitmap)) { canvas.DrawNinePatchedBitmap(__pProperty->GetDropShadowBitmapBounds(), *pShadowBitmap); } @@ -444,7 +444,7 @@ _IconListItem::DrawBitmap(Canvas& canvas, Bitmap& bitmap, bool isFocused, float if (__pProperty->GetDropShadowBitmap() != null && _FloatCompareGE(ratio, REFERENCE_FACTOR)) { const Bitmap* pShadowBitmap = __pProperty->GetDropShadowBitmap(); - if (pShadowBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pShadowBitmap)) { canvas.DrawNinePatchedBitmap(__pProperty->GetDropShadowBitmapBounds(), *pShadowBitmap); } @@ -480,7 +480,7 @@ _IconListItem::DrawBitmap(Canvas& canvas, Bitmap& bitmap, bool isFocused, float pCanvas->Clear(); - if (bitmap.IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(bitmap)) { pCanvas->DrawNinePatchedBitmap(FloatRectangle(0.0f, 0.0f, bitmap.GetWidthF(), bitmap.GetHeightF()), bitmap); } @@ -670,7 +670,7 @@ _IconListItem::DrawCheck(Canvas& canvas, float ratio) pCheckBgCanvas->Clear(); // draw background of check box - if (pBackgroundBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap)) { pCheckBgCanvas->DrawNinePatchedBitmap(FloatRectangle(0.0f, 0.0f, width, height), *pBackgroundBitmap); } @@ -710,7 +710,7 @@ _IconListItem::DrawCheck(Canvas& canvas, float ratio) { if (pBitmap != null) { - if (pBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBitmap)) { pCanvas->DrawNinePatchedBitmap(FloatRectangle(0.0f, 0.0f, pBitmap->GetWidthF(), pBitmap->GetHeightF()), *pBitmap); } @@ -772,7 +772,7 @@ _IconListItem::DrawOverlayBitmaps(void) overlayBitmapBounds.SetPosition(0.0f, 0.0f); Bitmap* pBitmap = pOverlayBitmap->pBitmap; - if(pBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBitmap)) { pCanvas->DrawNinePatchedBitmap(overlayBitmapBounds, *pBitmap); } @@ -1095,7 +1095,7 @@ _IconListItem::OnTickOccurred(const Tizen::Ui::Animations::VisualElementAnimatio SysLogException(NID_UI_CTRL, E_SUCCESS, "currentValue %d", currentValue.ToInt()); if (pBitmap != null) { - if (pBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBitmap)) { pCanvas->DrawNinePatchedBitmap(FloatRectangle(0.0f, 0.0f, pBitmap->GetWidthF(), pBitmap->GetHeightF()), *pBitmap); } diff --git a/src/ui/controls/FUiCtrl_IconListPresenter.cpp b/src/ui/controls/FUiCtrl_IconListPresenter.cpp index 9887d79..3bc91fc 100755 --- a/src/ui/controls/FUiCtrl_IconListPresenter.cpp +++ b/src/ui/controls/FUiCtrl_IconListPresenter.cpp @@ -1346,7 +1346,7 @@ _IconListPresenter::Draw(void) pCanvas->Clear(); FloatRectangle bounds(__pIconListView->GetBoundsF()); bounds.SetPosition(0.0f, 0.0f); - if (pBackgroundBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap)) { pCanvas->DrawNinePatchedBitmap(bounds, *pBackgroundBitmap); } @@ -1601,7 +1601,7 @@ _IconListPresenter::DrawEmptyList(void) if (pBitmap != null) { FloatRectangle bitmapBounds(bounds.x + bitmapXPosition, bounds.y, bitmapWidth, bitmapHeight); - if (pBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBitmap)) { pCanvas->DrawNinePatchedBitmap(bitmapBounds, *pBitmap); } diff --git a/src/ui/controls/FUiCtrl_LabelPresenter.cpp b/src/ui/controls/FUiCtrl_LabelPresenter.cpp old mode 100644 new mode 100755 index 08ca078..5012f95 --- a/src/ui/controls/FUiCtrl_LabelPresenter.cpp +++ b/src/ui/controls/FUiCtrl_LabelPresenter.cpp @@ -281,7 +281,7 @@ _LabelPresenter::DrawBackground(void) pCanvas->SetBackgroundColor(Color(0, 0, 0, 0)); pCanvas->Clear(); - if (pBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBitmap)) { pCanvas->DrawNinePatchedBitmap(_CoordinateSystemUtils::ConvertToInteger(bounds), *pBitmap); } @@ -292,7 +292,7 @@ _LabelPresenter::DrawBackground(void) if (pEffectBitmap != null) { - if (pEffectBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pEffectBitmap)) { pCanvas->DrawNinePatchedBitmap(_CoordinateSystemUtils::ConvertToInteger(bounds), *pEffectBitmap); } diff --git a/src/ui/controls/FUiCtrl_ListViewItem.cpp b/src/ui/controls/FUiCtrl_ListViewItem.cpp old mode 100644 new mode 100755 index 80e32eb..ecc4fe0 --- a/src/ui/controls/FUiCtrl_ListViewItem.cpp +++ b/src/ui/controls/FUiCtrl_ListViewItem.cpp @@ -1346,7 +1346,7 @@ _ListViewItem::DrawBitmap(FloatRectangle& rect, ListViewItemDrawingStatus status pCanvas->SetBackgroundColor(Color(0, 0, 0, 0)); pCanvas->Clear(); - if (pDrawBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pDrawBitmap)) { pCanvas->DrawNinePatchedBitmap(FloatRectangle(0.0f, 0.0f, rect.width, rect.height), *pDrawBitmap); } diff --git a/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp b/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp old mode 100644 new mode 100755 index cb895f0..cc6e2bf --- a/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp +++ b/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include "FUi_AccessibilityContainer.h" @@ -387,7 +388,7 @@ _MessageBoxPresenter::Draw(void) // Draw BG if (pBackgroundBitmap != null) { - if (pBackgroundBitmap->IsNinePatchedBitmap() == true) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap)) { pCanvas->DrawNinePatchedBitmap(bgBounds, *pBackgroundBitmap); } @@ -400,7 +401,7 @@ _MessageBoxPresenter::Draw(void) // Draw Outline if (!isCustomBitmap && pOutlineBitmap != null) { - if (pOutlineBitmap->IsNinePatchedBitmap() == true) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pOutlineBitmap)) { pCanvas->DrawNinePatchedBitmap(bgBounds, *pOutlineBitmap); } diff --git a/src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp b/src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp old mode 100644 new mode 100755 index 20c4435..415cccb --- a/src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp +++ b/src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp @@ -1530,7 +1530,7 @@ _OptionMenuPresenter::DrawResourceBitmap(Canvas& canvas, const FloatRectangle& b return r; } - if (pBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBitmap)) { r = canvas.DrawNinePatchedBitmap(bounds, *pBitmap); SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/ui/controls/FUiCtrl_PanelPresenter.cpp b/src/ui/controls/FUiCtrl_PanelPresenter.cpp old mode 100644 new mode 100755 index f07a1e3..d4a8596 --- a/src/ui/controls/FUiCtrl_PanelPresenter.cpp +++ b/src/ui/controls/FUiCtrl_PanelPresenter.cpp @@ -167,7 +167,7 @@ _PanelPresenter::DrawBackgrounBitmap(Canvas* pCanvas) bounds.height = bitmapHeight; } - if (pBackgroundBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap)) { result r = pCanvas->DrawNinePatchedBitmap(bounds, *pBackgroundBitmap); SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r)); @@ -198,7 +198,7 @@ _PanelPresenter::DrawGroupStyleBitmap(Canvas* pCanvas) pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pGroupStyleBitmap, Color::GetColor(COLOR_ID_MAGENTA), __pPanel->GetBackgroundColor()); if (pColorReplacedBitmap != null) { - if (pGroupStyleBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pGroupStyleBitmap)) { r = pCanvas->DrawNinePatchedBitmap(bounds, *pColorReplacedBitmap); SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); @@ -236,7 +236,7 @@ _PanelPresenter::DrawGroupStyleBackgroundBitmap(Tizen::Graphics::Canvas* pCanvas r = GetLastResult(); SysTryCatch(NID_UI_CTRL, pColorReplacedBitmap != null && r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); - if (pGroupStyleBackgroundBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pGroupStyleBackgroundBitmap)) { r = pCanvas->DrawNinePatchedBitmap(bounds, *pColorReplacedBitmap); SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/ui/controls/FUiCtrl_PopupPresenter.cpp b/src/ui/controls/FUiCtrl_PopupPresenter.cpp old mode 100644 new mode 100755 index 4fa5b8a..eb99e90 --- a/src/ui/controls/FUiCtrl_PopupPresenter.cpp +++ b/src/ui/controls/FUiCtrl_PopupPresenter.cpp @@ -410,7 +410,7 @@ _PopupPresenter::Draw(void) __pPopup->GetBoundsF().height + transTopMargin + transBottomMargin); const Bitmap* pBackgroundBitmap = __pPopup->GetBackgroundBitmap(); - if (pBackgroundBitmap->IsNinePatchedBitmap() == true) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap)) { pCanvas->DrawNinePatchedBitmap(bounds, *pBackgroundBitmap); } @@ -447,7 +447,7 @@ _PopupPresenter::Draw(void) const Bitmap* pOutlineBitmap = __pPopup->GetOutlineBitmap(); - if (pOutlineBitmap->IsNinePatchedBitmap() == true) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pOutlineBitmap)) { pBackgroundCanvas->DrawNinePatchedBitmap(bounds, *pOutlineBitmap); } diff --git a/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp b/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp old mode 100644 new mode 100755 index aeaaf9c..7cc1b85 --- a/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp @@ -480,7 +480,7 @@ _ProgressPopupPresenter::Draw(void) // Draw BG if (pBackgroundBitmap != null) { - if (pBackgroundBitmap->IsNinePatchedBitmap() == true) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap)) { pCanvas->DrawNinePatchedBitmap(bgBounds, *pBackgroundBitmap); } @@ -493,7 +493,7 @@ _ProgressPopupPresenter::Draw(void) // Draw Outline if (!isCustomBitmap && pOutlineBitmap != null) { - if (pOutlineBitmap->IsNinePatchedBitmap() == true) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pOutlineBitmap)) { pCanvas->DrawNinePatchedBitmap(bgBounds, *pOutlineBitmap); } diff --git a/src/ui/controls/FUiCtrl_ProgressPresenter.cpp b/src/ui/controls/FUiCtrl_ProgressPresenter.cpp old mode 100644 new mode 100755 index 24ba3c8..7bb21ea --- a/src/ui/controls/FUiCtrl_ProgressPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ProgressPresenter.cpp @@ -246,7 +246,7 @@ _ProgressPresenter::DrawBitmap(Canvas& canvas, const FloatRectangle& bounds, Bit { result r = E_SUCCESS; - if (pBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBitmap)) { r = canvas.DrawNinePatchedBitmap(bounds, *pBitmap); SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/ui/controls/FUiCtrl_ScrollPresenter.cpp b/src/ui/controls/FUiCtrl_ScrollPresenter.cpp old mode 100644 new mode 100755 index 6e80593..bbaea83 --- a/src/ui/controls/FUiCtrl_ScrollPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ScrollPresenter.cpp @@ -2305,7 +2305,7 @@ result _ScrollPresenter::DrawBitmap(Canvas& canvas, const FloatRectangle& bounds, const Bitmap& bitmap) { result r = E_SUCCESS; - if (bitmap.IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(bitmap)) { r = canvas.DrawNinePatchedBitmap(bounds, bitmap); SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Failed to draw ninepathced bitmap"); diff --git a/src/ui/controls/FUiCtrl_SearchBarPresenter.cpp b/src/ui/controls/FUiCtrl_SearchBarPresenter.cpp old mode 100644 new mode 100755 index eeb266e..3336cf4 --- a/src/ui/controls/FUiCtrl_SearchBarPresenter.cpp +++ b/src/ui/controls/FUiCtrl_SearchBarPresenter.cpp @@ -293,7 +293,7 @@ _SearchBarPresenter::Draw(void) pCanvas->SetBackgroundColor(bgColor); pCanvas->Clear(); - if (pBackgroundBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap)) { pCanvas->DrawNinePatchedBitmap(bounds, *pBackgroundBitmap); } @@ -389,7 +389,7 @@ _SearchBarPresenter::DrawIcon(void) { if (__pReplacedSearchFieldNormalBitmap != null) { - if (__pReplacedSearchFieldNormalBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*__pReplacedSearchFieldNormalBitmap)) { pIconCanvas->DrawNinePatchedBitmap(FloatRectangle(0, 0, iconBounds.width, iconBounds.height), *__pReplacedSearchFieldNormalBitmap); } @@ -403,7 +403,7 @@ _SearchBarPresenter::DrawIcon(void) { if (__pReplacedSearchFieldDisabledBitmap != null) { - if (__pReplacedSearchFieldDisabledBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*__pReplacedSearchFieldDisabledBitmap)) { pIconCanvas->DrawNinePatchedBitmap(FloatRectangle(0, 0, iconBounds.width, iconBounds.height), *__pReplacedSearchFieldDisabledBitmap); } @@ -416,7 +416,7 @@ _SearchBarPresenter::DrawIcon(void) if (!isCustomBitmap && __pSearchFieldEffectBitmap != null) { - if (__pSearchFieldEffectBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*__pSearchFieldEffectBitmap)) { pIconCanvas->DrawNinePatchedBitmap(FloatRectangle(0, 0, iconBounds.width, iconBounds.height), *__pSearchFieldEffectBitmap); } diff --git a/src/ui/controls/FUiCtrl_SliderOverlay.cpp b/src/ui/controls/FUiCtrl_SliderOverlay.cpp old mode 100644 new mode 100755 index 93e8162..3d2026b --- a/src/ui/controls/FUiCtrl_SliderOverlay.cpp +++ b/src/ui/controls/FUiCtrl_SliderOverlay.cpp @@ -273,7 +273,7 @@ _SliderOverlay::DrawSliderOverlay(int positionX, int handleWidth, int value) __pFont->GetTextExtent(text, text.GetLength(), textDim); - if (pBgBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBgBitmap)) { r = pCanvas->DrawNinePatchedBitmap(overlayRect, *pBgBitmap); } @@ -284,7 +284,7 @@ _SliderOverlay::DrawSliderOverlay(int positionX, int handleWidth, int value) SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); if (isCustomBitmap == false) { - if (pEffectBgBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pEffectBgBitmap)) { r = pCanvas->DrawNinePatchedBitmap(overlayRect, *pEffectBgBitmap); } diff --git a/src/ui/controls/FUiCtrl_SliderPresenter.cpp b/src/ui/controls/FUiCtrl_SliderPresenter.cpp old mode 100644 new mode 100755 index 340b9ee..52956b4 --- a/src/ui/controls/FUiCtrl_SliderPresenter.cpp +++ b/src/ui/controls/FUiCtrl_SliderPresenter.cpp @@ -1138,7 +1138,7 @@ _SliderPresenter::DrawSliderBar(Canvas& canvas) bitmapWidth = pHandleBitmap->GetWidth(); bitmapHeight = pHandleBitmap->GetHeight(); - if (pHandleBitmap->IsNinePatchedBitmap() == false) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pHandleBitmap)) { // to clip the center portion of the larger bitmap. if( bitmapWidth > __handleRect.width ) @@ -1343,7 +1343,7 @@ _SliderPresenter::DrawBitmap(Canvas& canvas, const FloatRectangle& bounds, Bitma { result r = E_SUCCESS; - if (pBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBitmap)) { r = canvas.DrawNinePatchedBitmap(bounds, *pBitmap); SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/ui/controls/FUiCtrl_TabBarPresenter.cpp b/src/ui/controls/FUiCtrl_TabBarPresenter.cpp old mode 100644 new mode 100755 index 1965ee5..8281ba2 --- a/src/ui/controls/FUiCtrl_TabBarPresenter.cpp +++ b/src/ui/controls/FUiCtrl_TabBarPresenter.cpp @@ -962,7 +962,7 @@ result _TabBarPresenter::DrawBitmap(Tizen::Graphics::Canvas& canvas, const Tizen::Graphics::FloatRectangle& bounds, const Tizen::Graphics::Bitmap& bitmap) { result r = E_SUCCESS; - if (bitmap.IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(bitmap)) { r = canvas.DrawNinePatchedBitmap(bounds, bitmap); SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Fail to draw ninepatched bitmap.") diff --git a/src/ui/controls/FUiCtrl_TabPresenter.cpp b/src/ui/controls/FUiCtrl_TabPresenter.cpp old mode 100644 new mode 100755 index 2ca9e3e..786cf8f --- a/src/ui/controls/FUiCtrl_TabPresenter.cpp +++ b/src/ui/controls/FUiCtrl_TabPresenter.cpp @@ -318,7 +318,7 @@ _TabPresenter::DrawResourceBitmap(Canvas& canvas, const FloatRectangle& bounds, return; } - if (pBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBitmap)) { r = canvas.DrawNinePatchedBitmap(bounds, *pBitmap); SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/ui/controls/FUiCtrl_TableViewItem.cpp b/src/ui/controls/FUiCtrl_TableViewItem.cpp old mode 100644 new mode 100755 index 7ddf550..800932e --- a/src/ui/controls/FUiCtrl_TableViewItem.cpp +++ b/src/ui/controls/FUiCtrl_TableViewItem.cpp @@ -79,7 +79,7 @@ _TableViewItemControl::OnDraw(void) pCanvas->SetBackgroundColor(Color(0, 0, 0, 0)); pCanvas->Clear(); - if (pBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBitmap)) { pCanvas->DrawNinePatchedBitmap(_CoordinateSystemUtils::ConvertToInteger(bounds), *pBitmap); // +++ check floating } @@ -1614,7 +1614,7 @@ _TableViewItem::PlayCheckBoxAnimation(void) __checkedBounds = CalculateAnnexBitmapBounds(annexWidth, annexHeight, *pCheckBox); if (IsChecked() == true) { - if (pCheckBox->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pCheckBox)) { FloatRectangle drawingRect(__checkedBounds.x, __checkedBounds.y, __checkedBounds.width, __checkedBounds.height); r = pCanvas->DrawNinePatchedBitmap(_CoordinateSystemUtils::ConvertToInteger(drawingRect), *pCheckBox); // +++ check floating @@ -2843,7 +2843,7 @@ result _TableViewItem::DrawBitmap(Canvas& canvas, const FloatRectangle& bounds, const Bitmap& bitmap) { result r = E_SUCCESS; - if (bitmap.IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(bitmap)) { r = canvas.DrawNinePatchedBitmap(_CoordinateSystemUtils::ConvertToInteger(bounds), bitmap); // +++ check floating SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Fail to draw ninepatched bitmap.", GetErrorMessage(r)) diff --git a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp old mode 100644 new mode 100755 index f2a0236..322a943 --- a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp +++ b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp @@ -550,7 +550,7 @@ _TokenEditPresenter::DrawText(void) Bitmap* pReplacementColorBackgroundBitmap = null; pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pTokenBgBitmap, Color::GetColor(COLOR_ID_MAGENTA), selectedTokenColor); - if (pReplacementColorBackgroundBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pReplacementColorBackgroundBitmap)) { pTokenCanvas->DrawNinePatchedBitmap(tokenRect, *pReplacementColorBackgroundBitmap); } @@ -739,7 +739,7 @@ _TokenEditPresenter::DrawToken(int count) { pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pTokenBgBitmap, Color::GetColor(COLOR_ID_MAGENTA), selectedTokenColor); - if (pReplacementColorBackgroundBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pReplacementColorBackgroundBitmap)) { pTokenCanvas->DrawNinePatchedBitmap(tokenRect, *pReplacementColorBackgroundBitmap); } @@ -763,7 +763,7 @@ _TokenEditPresenter::DrawToken(int count) { pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pTokenBgBitmap, Color::GetColor(COLOR_ID_MAGENTA), normalTokenColor); - if (pReplacementColorBackgroundBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pReplacementColorBackgroundBitmap)) { pTokenCanvas->DrawNinePatchedBitmap(tokenRect, *pReplacementColorBackgroundBitmap); } diff --git a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp old mode 100644 new mode 100755 index 52d46f2..e8c4010 --- a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp @@ -435,7 +435,7 @@ _ToolbarPresenter::DrawBackground(void) { if (pBackgroundBitmap) { - if (pBackgroundBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap)) { pCanvas->DrawNinePatchedBitmap(bounds, *pBackgroundBitmap); } @@ -453,7 +453,7 @@ _ToolbarPresenter::DrawBackground(void) { if (pReplacementColorBackgroundBitmap) { - if (pReplacementColorBackgroundBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pReplacementColorBackgroundBitmap)) { pCanvas->DrawNinePatchedBitmap(bounds, *pReplacementColorBackgroundBitmap); } @@ -1993,7 +1993,7 @@ _ToolbarPresenter::SetBouncingVisualElement(float startX, float startY) if (__pBouncingEffectBitmap) { - if (__pBouncingEffectBitmap->IsNinePatchedBitmap()) + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*__pBouncingEffectBitmap)) { pCanvas->DrawNinePatchedBitmap(_CoordinateSystemUtils::ConvertToInteger(rect), *__pBouncingEffectBitmap); -- 2.7.4