Update the code to get the pixmap directly.

Change-Id: I0a79f9bf0716bbabb9976c91c0b3012f3008aa00
Signed-off-by: kyeongwoo.lee <kyeongwoo.lee@samsung.com>

diff --git a/src/FShell_AppWidgetFrame.cpp b/src/FShell_AppWidgetFrame.cpp
index 7688da6..16a4144 100644 (file)
--- a/src/FShell_AppWidgetFrame.cpp
+++ b/src/FShell_AppWidgetFrame.cpp
@@ -99,7 +99,7 @@ _AppWidgetFrame::Initialize(const FloatDimension& size)
        r = SetBounds(bounds);
        SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       __pAppWidgetLayer->SetLayerBounds(FloatRectangle(0.0f, 0.0f, 1.0f, 1.0f));
+       __pAppWidgetLayer->SetLayerBounds(bounds);
        __pAppWidgetLayer->SetShowState(false);
 
        __pAppWidgetFrameRootVisualElement->SetImplicitAnimationEnabled(false);

diff --git a/src/FShell_AppWidgetLayer.cpp b/src/FShell_AppWidgetLayer.cpp
index 23d5737..22c7ed2 100644 (file)
--- a/src/FShell_AppWidgetLayer.cpp
+++ b/src/FShell_AppWidgetLayer.cpp
@@ -136,6 +136,8 @@ _AppWidgetLayer::_AppWidgetLayer(const Tizen::Base::String& providerId, const Fl
        {
                __physicalSize.height = 1;
        }
+
+       __providerId = _AppWidgetProviderManagerImpl::GetInstance()->GetCurrentInstanceId();
 }
 
 _AppWidgetLayer::~_AppWidgetLayer(void)

diff --git a/src/FShell_AppWidgetProviderManagerImpl.cpp b/src/FShell_AppWidgetProviderManagerImpl.cpp
index e6fc223..838daa1 100644 (file)
--- a/src/FShell_AppWidgetProviderManagerImpl.cpp
+++ b/src/FShell_AppWidgetProviderManagerImpl.cpp
@@ -297,6 +297,12 @@ _AppWidgetProviderManagerImpl::ContainsAppWidget(const String& instanceId) const
        return contains;
 }
 
+String
+_AppWidgetProviderManagerImpl::GetCurrentInstanceId(void)
+{
+       return __currentInstanceId;
+}
+
 result
 _AppWidgetProviderManagerImpl::CreateAppWidget(const String& name, const String& instanceId, float width, float height, const String& userInfo)
 {
@@ -317,7 +323,12 @@ _AppWidgetProviderManagerImpl::CreateAppWidget(const String& name, const String&
        pAppWidget->Construct(instanceId);
        __appwidgetProviders.Add(instanceId, pAppWidget);
 
+       __currentInstanceId = instanceId;
+
        bool ret = pAppWidget->OnAppWidgetProviderInitializing(width, height, userInfo);
+
+       __currentInstanceId = "";
+
        SysTryReturnResult(NID_SHELL, ret == true, E_OPERATION_CANCELED, "OnAppWidgetProviderInitializing returns 'false'. The provider will be removed.");
        SysTryReturnResult(NID_SHELL, pAppWidget->GetAppWidgetFrame(), E_INVALID_OPERATION, "Failed to get the frame.");
 

diff --git a/src/inc/FShell_AppWidgetProviderManagerImpl.h b/src/inc/FShell_AppWidgetProviderManagerImpl.h
index befcbab..e38ea2d 100644 (file)
--- a/src/inc/FShell_AppWidgetProviderManagerImpl.h
+++ b/src/inc/FShell_AppWidgetProviderManagerImpl.h
@@ -94,6 +94,7 @@ public:
        result AddAppWidgetTouchEventListener(const Tizen::Base::String& instanceId, _IAppWidgetTouchEventListener& listener);
        result RemoveAppWidgetTouchEventListener(const Tizen::Base::String& instanceId);
        result SetAppWidgetPopupEventListener(_IAppWidgetTouchEventListener* pListener);
+       Tizen::Base::String GetCurrentInstanceId(void);
 
 private:
        _AppWidgetProviderManagerImpl();
@@ -121,6 +122,7 @@ private:
 
 
 private:
+       Tizen::Base::String __currentInstanceId;
 
        // for AppWidget
        IAppWidgetProviderFactory* __pAppWidgetFactory;