rollback GetImageSource for button, label

Change-Id: I89230c74dea108c9289ca22c18751141fb7124b9

diff --git a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
index 2068428..8646af6 100644 (file)
--- a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
@@ -43,6 +43,7 @@ _ButtonPresenter::_ButtonPresenter(void)
        , __pButtonModel(null)
        , __previousEnabledState(false)
        , __touchMoveHandled(false)
+       , __lazyDecode(false)
        , __pFont(null)
        , __pTextObject(null)
        , __pBase(null)
@@ -345,11 +346,15 @@ _ButtonPresenter::DrawBackground(void)
                                __pBase->SetBackgroundColor(_Colorf(
                                                (float)bgColor.GetRed() / 255, (float)bgColor.GetGreen() / 255, (float)bgColor.GetBlue() / 255, (float)bgColor.GetAlpha() / 255));
                                __pBase->SetImageSource(imagePath);
+
+                               __lazyDecode = true;
                        }
                        else
                        {
                                __pBase->SetImageSource(L"");
 
+                               __lazyDecode = false;
+
                                pCanvas = __pButton->GetCanvasN();
                                if (pCanvas == null)
                                {
@@ -1159,7 +1164,7 @@ _ButtonPresenter::OnCanvasRequestedN(const FloatRectangle& bounds)
 {
        Canvas* pCanvas = null;
 
-       if (__pBase->GetImageSource().IsEmpty() == true)
+       if (__lazyDecode == true)
        {
                Bitmap* pBackgroundBitmap = null;
                _ButtonStatus status = __pButton->GetButtonStatus();

diff --git a/src/ui/controls/FUiCtrl_LabelPresenter.cpp b/src/ui/controls/FUiCtrl_LabelPresenter.cpp
index 08264e2..231fa4a 100644 (file)
--- a/src/ui/controls/FUiCtrl_LabelPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_LabelPresenter.cpp
@@ -47,6 +47,7 @@ _LabelPresenter::_LabelPresenter(void)
        : __pLabel(null)
        , __pLabelModel(null)
        , __previousEnabledState(false)
+       , __lazyDecode(false)
        , __pFont(null)
        , __pTextObject(null)
        , __pBase(null)
@@ -286,11 +287,15 @@ _LabelPresenter::DrawBackground(void)
                                        (float)bgColor.GetRed() / 255, (float)bgColor.GetGreen() / 255, (float)bgColor.GetBlue() / 255, (float)bgColor.GetAlpha() / 255));
 
                        __pBase->SetImageSource(imagePath);
+
+                       __lazyDecode = true;
                }
                else
                {
                        __pBase->SetImageSource(L"");
 
+                       __lazyDecode = false;
+
                        pCanvas = __pLabel->GetCanvasN();
                        if (pCanvas == null)
                        {
@@ -461,7 +466,7 @@ _LabelPresenter::OnCanvasRequestedN(const FloatRectangle& bounds)
 {
        Canvas* pCanvas = null;
 
-       if (__pBase->GetImageSource().IsEmpty() == true)
+       if (__lazyDecode == true)
        {
                Bitmap* pBitmap = null;
 

diff --git a/src/ui/inc/FUiCtrl_ButtonPresenter.h b/src/ui/inc/FUiCtrl_ButtonPresenter.h
index 765738e..315994f 100644 (file)
--- a/src/ui/inc/FUiCtrl_ButtonPresenter.h
+++ b/src/ui/inc/FUiCtrl_ButtonPresenter.h
@@ -111,6 +111,7 @@ private:
        bool __needDraw;
        bool __previousEnabledState;
        bool __touchMoveHandled;
+       bool __lazyDecode;
 
        Tizen::Graphics::Font* __pFont;
        Tizen::Graphics::_Text::TextObject* __pTextObject;

diff --git a/src/ui/inc/FUiCtrl_LabelPresenter.h b/src/ui/inc/FUiCtrl_LabelPresenter.h
index d487bda..f67c256 100644 (file)
--- a/src/ui/inc/FUiCtrl_LabelPresenter.h
+++ b/src/ui/inc/FUiCtrl_LabelPresenter.h
@@ -95,6 +95,7 @@ private:
        _LabelModel* __pLabelModel;
 
        bool __previousEnabledState;
+       bool __lazyDecode;
 
        Tizen::Graphics::Font* __pFont;
        Tizen::Graphics::_Text::TextObject* __pTextObject;