Apply gem

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

diff --git a/src/FShell_AppWidgetFrame.cpp b/src/FShell_AppWidgetFrame.cpp
index 0fb29df..b126421 100644 (file)
--- a/src/FShell_AppWidgetFrame.cpp
+++ b/src/FShell_AppWidgetFrame.cpp
@@ -85,34 +85,18 @@ _AppWidgetFrame::CreateAppWidgetFrameN(void)
 result
 _AppWidgetFrame::Initialize(const FloatDimension& size)
 {
-       result r = E_SUCCESS;
-
-       const float DEFAULT_WIDTH = 172.0f;
-       const float DEFAULT_HEIGHT = 172.0f;
-
-       FloatDimension appwidgetSize(size);
-       if (appwidgetSize.width <= 0 )
-       {
-               appwidgetSize.width = DEFAULT_WIDTH;
-       }
-
-       if (appwidgetSize.height <= 0 )
-       {
-               appwidgetSize.height = DEFAULT_HEIGHT;
-       }
-
        SetSystemWindow(true);
 
        __appwidgetSize = size;
 
-       r = CreateRootVisualElement();
+       result r = __pAppWidgetFramePresenter->Initialize();
        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);
+       r = CreateRootVisualElement();
        SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       r = __pAppWidgetFramePresenter->Initialize();
+       FloatRectangle bounds(0.0f, 0.0f, 1.0f, 1.0f);
+       r = SetBounds(bounds);
        SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        __pAppWidgetLayer->SetLayerBounds(bounds);
@@ -139,6 +123,10 @@ _AppWidgetFrame::SetProviderId(const String& providerId)
        result r = __pAppWidgetLayer->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;
 }
 
@@ -188,7 +176,7 @@ _AppWidgetFrame::SetLayerBounds(const FloatRectangle& bounds)
 result
 _AppWidgetFrame::CreateLayer(void)
 {
-       unique_ptr<_AppWidgetLayer> pLayer(new (std::nothrow) _AppWidgetLayer(__appwidgetSize));
+       unique_ptr<_AppWidgetLayer> pLayer(new (std::nothrow) _AppWidgetLayer(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();