fix dcm jira defect for button imagesource draw

Change-Id: I2032639824d63da04b25539dc361183dc7d97e2e

diff --git a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
index 9631b9f..04c975a 100644 (file)
--- a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
@@ -281,7 +281,11 @@ _ButtonPresenter::Draw(void)
        }
 
        DrawBitmap();
-       DrawText();
+
+       if (!__pButton->GetText().IsEmpty())
+       {
+               DrawText();
+       }
 
        if (__showUnderlineBitmap && __pButton->GetToolbarItemBackgroundBitmap(status) == null)
        {

diff --git a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
index a7f9e93..de82d85 100644 (file)
--- a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
@@ -578,6 +578,7 @@ _CheckButtonPresenter::DrawBackground(void)
 
        delete pCanvas;
        delete pReplacementColorBackgroundBitmap;
+       delete pHighlightedReplacementColorBackgroundBitmap;
 
        return;
 }

diff --git a/src/ui/controls/FUiCtrl_LabelPresenter.cpp b/src/ui/controls/FUiCtrl_LabelPresenter.cpp
index d9506ed..1d6f980 100644 (file)
--- a/src/ui/controls/FUiCtrl_LabelPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_LabelPresenter.cpp
@@ -261,7 +261,11 @@ void
 _LabelPresenter::Draw(void)
 {
        DrawBackground();
-       DrawText();
+
+       if (!__pLabel->GetText().IsEmpty())
+       {
+               DrawText();
+       }
 
        return;
 }
@@ -368,13 +372,6 @@ _LabelPresenter::DrawBackground(void)
 void
 _LabelPresenter::DrawText(void)
 {
-       if (__pLabel->GetText().IsEmpty())
-       {
-               SysLog(NID_UI_CTRL, "Text is empty.");
-
-               return;
-       }
-
        TextObjectAlignment horizontalAlign = TEXT_OBJECT_ALIGNMENT_CENTER;
        TextObjectAlignment verticalAlign = TEXT_OBJECT_ALIGNMENT_MIDDLE;