Fixed the button bg drawing issue for MSG_BOX_STYLE_NONE.

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

diff --git a/src/ui/controls/FUiCtrl_MessageBox.cpp b/src/ui/controls/FUiCtrl_MessageBox.cpp
index 9f72485..6a6d294 100644 (file)
--- a/src/ui/controls/FUiCtrl_MessageBox.cpp
+++ b/src/ui/controls/FUiCtrl_MessageBox.cpp
@@ -155,37 +155,43 @@ _MessageBox::Initialize(const String& title, const String& text, MessageBoxStyle
        r = GetLastResult();
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] failed to load MessageBox BG Image.");
 
-       // MsgBox-BottomBitmap
-       GET_BITMAP_CONFIG_N(MESSAGEBOX::BG_BUTTON_AREA, BITMAP_PIXEL_FORMAT_ARGB8888, buttonBgBitmap);
-       r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
-       // MsgBox-BottomEffectBitmap
-       GET_BITMAP_CONFIG_N(MESSAGEBOX::BG_BUTTON_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, __pButtonEffectBitmap);
-       r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
-       // MsgBox-TitleBitmap
-       GET_BITMAP_CONFIG_N(MESSAGEBOX::BG_TITLE_AREA, BITMAP_PIXEL_FORMAT_ARGB8888, titleBgBitmap);
-       r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
-       // MsgBox-TitleEffectBitmap
-       GET_BITMAP_CONFIG_N(MESSAGEBOX::BG_TITLE_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, __pTitleEffectBitmap);
-       r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
-       _pComposedBgBitmap = _BitmapImpl::GetColorReplacedBitmapN(*_pBgBitmap, Color::GetColor(COLOR_ID_MAGENTA), _bgColor);
-       r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
-       __pComposedButtonBitmap = _BitmapImpl::GetColorReplacedBitmapN(*buttonBgBitmap, Color::GetColor(COLOR_ID_MAGENTA), buttonBgColor);
-       r = GetLastResult();
-       SysTryCatch(NID_UI_CTRL, (__pComposedButtonBitmap != null), , r, "[%s] Propagating.", GetErrorMessage(r));
+       if (style != MSGBOX_STYLE_NONE)
+       {
+               // MsgBox-BottomBitmap
+               GET_BITMAP_CONFIG_N(MESSAGEBOX::BG_BUTTON_AREA, BITMAP_PIXEL_FORMAT_ARGB8888, buttonBgBitmap);
+               r = GetLastResult();
+               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+
+               // MsgBox-BottomEffectBitmap
+               GET_BITMAP_CONFIG_N(MESSAGEBOX::BG_BUTTON_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, __pButtonEffectBitmap);
+               r = GetLastResult();
+               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+
+               __pComposedButtonBitmap = _BitmapImpl::GetColorReplacedBitmapN(*buttonBgBitmap, Color::GetColor(COLOR_ID_MAGENTA), buttonBgColor);
+               r = GetLastResult();
+               SysTryCatch(NID_UI_CTRL, (__pComposedButtonBitmap != null), , r, "[%s] Propagating.", GetErrorMessage(r));
+       }
 
-       __pComposedTitleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*titleBgBitmap, Color::GetColor(COLOR_ID_MAGENTA), titleBgColor);
-       r = GetLastResult();
-       SysTryCatch(NID_UI_CTRL, (__pComposedTitleBitmap != null), , r, "[%s] Propagating.", GetErrorMessage(r));
+       if (_titleState)
+       {
+               // MsgBox-TitleBitmap
+               GET_BITMAP_CONFIG_N(MESSAGEBOX::BG_TITLE_AREA, BITMAP_PIXEL_FORMAT_ARGB8888, titleBgBitmap);
+               r = GetLastResult();
+               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+
+               // MsgBox-TitleEffectBitmap
+               GET_BITMAP_CONFIG_N(MESSAGEBOX::BG_TITLE_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, __pTitleEffectBitmap);
+               r = GetLastResult();
+               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+
+               _pComposedBgBitmap = _BitmapImpl::GetColorReplacedBitmapN(*_pBgBitmap, Color::GetColor(COLOR_ID_MAGENTA), _bgColor);
+               r = GetLastResult();
+               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+
+               __pComposedTitleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*titleBgBitmap, Color::GetColor(COLOR_ID_MAGENTA), titleBgColor);
+               r = GetLastResult();
+               SysTryCatch(NID_UI_CTRL, (__pComposedTitleBitmap != null), , r, "[%s] Propagating.", GetErrorMessage(r));
+       }
 
        // for clearing canvas
        if (GetVisualElement() != null)
@@ -205,29 +211,47 @@ _MessageBox::Initialize(const String& title, const String& text, MessageBoxStyle
 
        SetTouchPressThreshold(0.08);
 
-       delete buttonBgBitmap;
-       buttonBgBitmap = null;
+       if (buttonBgBitmap != null)
+       {
+               delete buttonBgBitmap;
+               buttonBgBitmap = null;
+       }
 
-       delete titleBgBitmap;
-       titleBgBitmap = null;
+       if (titleBgBitmap != null)
+       {
+               delete titleBgBitmap;
+               titleBgBitmap = null;
+       }
 
        return r;
 
 CATCH:
-       delete buttonBgBitmap;
-       buttonBgBitmap = null;
+       if (buttonBgBitmap != null)
+       {
+               delete buttonBgBitmap;
+               buttonBgBitmap = null;
+       }
 
-       delete titleBgBitmap;
-       titleBgBitmap = null;
+       if (titleBgBitmap != null)
+       {
+               delete titleBgBitmap;
+               titleBgBitmap = null;
+       }
 
        delete _pComposedBgBitmap;
        _pComposedBgBitmap = null;
 
-       delete __pComposedButtonBitmap;
-       __pComposedButtonBitmap = null;
+       if (__pComposedButtonBitmap != null)
+       {
+               delete __pComposedButtonBitmap;
+               __pComposedButtonBitmap = null;
+       }
 
-       delete __pComposedTitleBitmap;
-       __pComposedTitleBitmap = null;
+       if(__pComposedTitleBitmap != null)
+       {
+               delete __pComposedTitleBitmap;
+               __pComposedTitleBitmap = null;
+       }
 
        return r;
 }