Apply gem

[platform/framework/native/shell.git] / src / FShell_AppWidgetPopup.cpp

diff --git a/src/FShell_AppWidgetPopup.cpp b/src/FShell_AppWidgetPopup.cpp
index 13945af..4c6ff7f 100644 (file)
--- a/src/FShell_AppWidgetPopup.cpp
+++ b/src/FShell_AppWidgetPopup.cpp
@@ -53,7 +53,7 @@ class _AppWidgetPopupLayer
        : public _AppWidgetLayer
 {
 public:
-       _AppWidgetPopupLayer(const FloatDimension& size);
+       _AppWidgetPopupLayer(const Tizen::Base::String& providerId, const FloatDimension& size);
        virtual ~_AppWidgetPopupLayer(void);
 
 private:
@@ -66,8 +66,8 @@ private:
        virtual void ReleasePixmap(void);
 };
 
-_AppWidgetPopupLayer::_AppWidgetPopupLayer(const FloatDimension& size)
-       : _AppWidgetLayer(size)
+_AppWidgetPopupLayer::_AppWidgetPopupLayer(const Tizen::Base::String& providerId, const FloatDimension& size)
+       : _AppWidgetLayer(providerId, size)
 {
 }
 
@@ -180,28 +180,31 @@ _AppWidgetPopup::Initialize(const FloatDimension& size)
 
        SetSystemWindow(true);
 
-       r = CreateRootVisualElement();
-       SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
-       FloatRectangle bounds(0.0f, 0.0f, size.width, size.height);
-       r = SetBounds(bounds);
-       SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
        r = __pAppWidgetPopupPresenter->Initialize();
        SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       __pAppWidgetPopupLayer->SetLayerBounds(bounds);
-       __pAppWidgetPopupLayer->SetShowState(false);
-
-       __pAppWidgetPopupRootVisualElement->SetImplicitAnimationEnabled(false);
-       __pAppWidgetPopupRootVisualElement->SetName(L"_AppWidgetPopup");
-       __pAppWidgetPopupRootVisualElement->SetBounds(bounds);
-       __pAppWidgetPopupRootVisualElement->SetShowState(false);
-
-       SetBackgroundColor(Color(0, 0, 0, 0));
-
-       __pEventManager->RegisterTouchEventHandler(*this);
-       r = GetLastResult();
+       r = CreateRootVisualElement();\r
+       SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));\r
+\r
+       FloatRectangle bounds(0.0f, 0.0f, 1.0f, 1.0f);\r
+       r = SetBounds(bounds);\r
+       SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));\r
+\r
+       r = __pAppWidgetPopupPresenter->Initialize();\r
+       SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));\r
+\r
+       __pAppWidgetPopupLayer->SetLayerBounds(bounds);\r
+       __pAppWidgetPopupLayer->SetShowState(false);\r
+\r
+       __pAppWidgetPopupRootVisualElement->SetImplicitAnimationEnabled(false);\r
+       __pAppWidgetPopupRootVisualElement->SetName(L"_AppWidgetPopup");\r
+       __pAppWidgetPopupRootVisualElement->SetBounds(bounds);\r
+       __pAppWidgetPopupRootVisualElement->SetShowState(false);\r
+\r
+       SetBackgroundColor(Color(0, 0, 0, 0));\r
+\r
+       __pEventManager->RegisterTouchEventHandler(*this);\r
+       r = GetLastResult();\r
        SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        return r;
@@ -215,6 +218,10 @@ _AppWidgetPopup::SetProviderId(const String& providerId)
        result r = __pAppWidgetPopupLayer->SetProviderId(providerId);
        SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
+       FloatRectangle bounds(0.0f, 0.0f, __appwidgetSize.width, __appwidgetSize.height);
+       r = SetBounds(bounds);
+       SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+
        return r;
 }
 
@@ -331,7 +338,7 @@ _AppWidgetPopup::UpdateClientBounds(const FloatDimension& size, FloatRectangle&
 result
 _AppWidgetPopup::CreateLayer(void)
 {
-       unique_ptr<_AppWidgetPopupLayer> pLayer(new (std::nothrow) _AppWidgetPopupLayer(__appwidgetSize));
+       unique_ptr<_AppWidgetPopupLayer> pLayer(new (std::nothrow) _AppWidgetPopupLayer(GetProviderId(), GetSizeF()));
        SysTryReturn(NID_SHELL, pLayer, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory is insufficient.");
 
        result r = pLayer->Construct();