Fixed icon error

Change-Id: Ibf2d76249a41cd75c0946ca353d4ce00d0e3c27f
Signed-off-by: HeeJu Kang <mobum.kang@samsung.com>

diff --git a/project/inc/AppWidgetViewerMainForm.h b/project/inc/AppWidgetViewerMainForm.h
index b0b8d5b..7e074bf 100644 (file)
--- a/project/inc/AppWidgetViewerMainForm.h
+++ b/project/inc/AppWidgetViewerMainForm.h
@@ -67,7 +67,7 @@ private:
 
        Tizen::Ui::Controls::ListView* __pList;
        Tizen::Base::Collection::IList* __pAppWidgetProviderList;
-       Tizen::Base::Collection::ArrayList* __pAppWidgetIconList;
+       Tizen::Base::Collection::ArrayListT<Tizen::Graphics::Bitmap*>* __pAppWidgetIconList;
        Tizen::Shell::AppWidgetProviderInfo* __pSelectedProviderInfo;
 }; // AppWidgetViewerMainForm
 

diff --git a/project/src/AppWidgetViewerMainForm.cpp b/project/src/AppWidgetViewerMainForm.cpp
index 1d6a2bc..dd9a2f9 100644 (file)
--- a/project/src/AppWidgetViewerMainForm.cpp
+++ b/project/src/AppWidgetViewerMainForm.cpp
@@ -47,8 +47,23 @@ AppWidgetViewerMainForm::AppWidgetViewerMainForm(void)
        __pAppWidgetProviderList = AppWidgetManager::GetInstance()->GetAppWidgetProviderInfoListN();
        TryReturnVoid(__pAppWidgetProviderList, "GetAppWidgetListN returns null!!" );
 
-       __pAppWidgetIconList = new ArrayList(SingleObjectDeleter);
-       __pAppWidgetIconList->Construct();
+       __pAppWidgetIconList = new ArrayListT<Bitmap*>;
+
+       for( int i = 0; i < __pAppWidgetProviderList->GetCount(); i++)
+       {
+               AppWidgetProviderInfo* pAppWidgetProviderInfo = dynamic_cast<AppWidgetProviderInfo*>(__pAppWidgetProviderList->GetAt(i) );
+
+               Tizen::Media::Image image;
+               result r = image.Construct();
+               Bitmap* pBmp = image.DecodeN(pAppWidgetProviderInfo->GetIconPath(), BITMAP_PIXEL_FORMAT_ARGB8888);
+               AppLog("AppId (%ls)", pAppWidgetProviderInfo->GetAppId().GetPointer());
+               AppLog("Name (%ls)", pAppWidgetProviderInfo->GetName().GetPointer());
+               AppLog("DisplayName (%ls)", pAppWidgetProviderInfo->GetDisplayName().GetPointer());
+               AppLog("IconPath (%ls)", pAppWidgetProviderInfo->GetIconPath().GetPointer());
+               AppLog("pBmp i (%d) (0x%x)", i, pBmp);
+
+               __pAppWidgetIconList->Add(pBmp);
+       }
 }
 
 AppWidgetViewerMainForm::~AppWidgetViewerMainForm(void)
@@ -235,20 +250,15 @@ AppWidgetViewerMainForm::CreateItem(int index, int itemWidth)
        Rectangle textRect(text_x, LIST_ITEM_MARGIN_TOP, GetClientAreaBounds().width - LIST_ITEM_MARGIN_LEFT - text_x, LIST_ITEM_TEXT_HEIGHT);
        
        AppWidgetProviderInfo* pProviderInfo = dynamic_cast<AppWidgetProviderInfo*>(__pAppWidgetProviderList->GetAt(index));
+
        if (pProviderInfo)
        {
-               String iconPath = pProviderInfo->GetIconPath();
-               if( File::IsFileExist(iconPath) )
-               {
-                       Tizen::Media::Image image;
-                       image.Construct();
-                       Bitmap* pBmp = image.DecodeN(iconPath, BITMAP_PIXEL_FORMAT_ARGB8888);
-                       if(pBmp)
-                       {
-                               pItem->AddElement(iconRect, ID_FORMAT_BITMAP, *pBmp, null, null);
-                               __pAppWidgetIconList->Add(pBmp);
-                       }
-               }
+               Bitmap* pBmp = null;
+               __pAppWidgetIconList->GetAt(index, pBmp);
+               AppLog("IconPath (%ls)", pProviderInfo->GetIconPath().GetPointer());
+               AppLog("pBmp index (%d) (0x%x)", index, pBmp);
+
+               pItem->AddElement(iconRect, ID_FORMAT_BITMAP, *pBmp, null, null);
                pItem->AddElement(textRect, ID_FORMAT_STRING, pProviderInfo->GetDisplayName()+" ("+pProviderInfo->GetAppId()+")", true);
        }