Fix for DCM-1565

Signed-off-by: sriram.k <sriram.k@samsung.com>
Change-Id: I9ce5d39d88360d2552706bf8e93d9b02401af117

diff --git a/src/ui/controls/FUiCtrl_PopupPresenter.cpp b/src/ui/controls/FUiCtrl_PopupPresenter.cpp
index c0474e7..16730f2 100644 (file)
--- a/src/ui/controls/FUiCtrl_PopupPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_PopupPresenter.cpp
@@ -459,32 +459,35 @@ _PopupPresenter::Draw(void)
        // Draw Title
        if (__pPopup->HasTitle())
        {
-               const Bitmap* pTitleBitmap = __pPopup->GetTitleBackgroundBitmap();
-               const Bitmap* pTitleEffectBitmap = __pPopup->GetTitleBackgroundEffectBitmap();
-
-               //DrawTitleBG
-               if(pTitleBitmap != null)
+               if (__pPopup->GetColor() != Color(0x00000000))
                {
-                       if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pTitleBitmap))
-                       {
-                               pCanvas->DrawNinePatchedBitmap(_titleBgBounds, *pTitleBitmap);
-                       }
-                       else
-                       {
-                               pCanvas->DrawBitmap(_titleBgBounds, *pTitleBitmap);
-                       }
-               }
+                       const Bitmap* pTitleBitmap = __pPopup->GetTitleBackgroundBitmap();
+                       const Bitmap* pTitleEffectBitmap = __pPopup->GetTitleBackgroundEffectBitmap();
 
-               //DrawEffectTitleBitmap
-               if (pTitleEffectBitmap != null)
-               {
-                       if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pTitleEffectBitmap))
+                       //DrawTitleBG
+                       if(pTitleBitmap != null)
                        {
-                               pCanvas->DrawNinePatchedBitmap(_titleBgBounds, *pTitleEffectBitmap);
+                               if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pTitleBitmap))
+                               {
+                                       pCanvas->DrawNinePatchedBitmap(_titleBgBounds, *pTitleBitmap);
+                               }
+                               else
+                               {
+                                       pCanvas->DrawBitmap(_titleBgBounds, *pTitleBitmap);
+                               }
                        }
-                       else
+
+                       //DrawEffectTitleBitmap
+                       if (pTitleEffectBitmap != null)
                        {
-                               pCanvas->DrawBitmap(_titleBgBounds, *pTitleEffectBitmap);
+                               if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pTitleEffectBitmap))
+                               {
+                                       pCanvas->DrawNinePatchedBitmap(_titleBgBounds, *pTitleEffectBitmap);
+                               }
+                               else
+                               {
+                                       pCanvas->DrawBitmap(_titleBgBounds, *pTitleEffectBitmap);
+                               }
                        }
                }
 
@@ -504,7 +507,7 @@ _PopupPresenter::Draw(void)
        // Draw Outline
        if (!isCustomBitmap && __pPopup->GetOutlineBitmap() != null &&
                _FloatCompareGE(pBounds.width, minSize.width) &&
-               _FloatCompareGE(pBounds.height, minSize.height))
+            _FloatCompareGE(pBounds.height, minSize.height) && __pPopup->GetColor() != Color(0x00000000))
        {
                FloatRectangle bounds(0.0f,
                                                 0.0f,