Apply indicator size from int to float.
authorKeuckdo Bang <keuckdo.bang@samsung.net>
Tue, 28 May 2013 00:09:48 +0000 (09:09 +0900)
committerKeuckdo Bang <keuckdo.bang@samsung.net>
Tue, 28 May 2013 00:09:48 +0000 (09:09 +0900)
Change-Id: Ia1346165139377ab6096bcc8943cdfd65809f2fd

src/ui/controls/FUiCtrl_IndicatorManager.cpp

index 5074719..90c3a8a 100644 (file)
@@ -295,8 +295,8 @@ _IndicatorManager::MakeIndicatorComponentArrayN(_Window* pWindow)
 {
        result r = E_SUCCESS;
        Eina_Bool result = EINA_TRUE;
-       Dimension portraitsize(0,0);
-       Dimension landscapesize(0,0);
+       FloatDimension portraitsize(0.0f, 0.0f);
+       FloatDimension landscapesize(0.0f, 0.0f);
 
        _VisualElement* pLandscapeVisualElement = null;
        _VisualElement* pPortraitVisualElement = null;
@@ -308,8 +308,8 @@ _IndicatorManager::MakeIndicatorComponentArrayN(_Window* pWindow)
        Ecore_Evas* pEcore_Evas = pEflLayer->GetEcoreEvas();
        SysTryCatch(NID_UI_CTRL, pEcore_Evas, , E_SYSTEM, "[E_SYSTEM] A system error occurred.");
 
-       portraitsize = GetIndicatorSize(_INDICATOR_ORIENTATION_PORTRAIT);
-       landscapesize = GetIndicatorSize(_INDICATOR_ORIENTATION_LANDSCAPE);
+       portraitsize = GetIndicatorSizeF(_INDICATOR_ORIENTATION_PORTRAIT);
+       landscapesize = GetIndicatorSizeF(_INDICATOR_ORIENTATION_LANDSCAPE);
 
        //Get indicator Image Object
        for(int i = 0 ; i < NUMBER_OF_OBJECT ; i++)
@@ -328,8 +328,8 @@ _IndicatorManager::MakeIndicatorComponentArrayN(_Window* pWindow)
                evas_object_move(pPortraitEvasObject, 0, 0);
                evas_object_move(pLandscapeEvasObject, 0, 0);
 
-               VisualElementSurface* pPortraitSurface = _VisualElementSurfaceImpl::CreateSurfaceUsingExistingObjectN(*pWindow->GetDisplayContext(), reinterpret_cast<Handle>(pPortraitEvasObject), portraitsize);
-               VisualElementSurface* pLandScapeSurface = _VisualElementSurfaceImpl::CreateSurfaceUsingExistingObjectN(*pWindow->GetDisplayContext(), reinterpret_cast<Handle>(pLandscapeEvasObject), landscapesize);
+               VisualElementSurface* pPortraitSurface = _VisualElementSurfaceImpl::CreateSurfaceUsingExistingObjectN(*pWindow->GetDisplayContext(), reinterpret_cast<Handle>(pPortraitEvasObject), GetIndicatorSize(_INDICATOR_ORIENTATION_PORTRAIT));
+               VisualElementSurface* pLandScapeSurface = _VisualElementSurfaceImpl::CreateSurfaceUsingExistingObjectN(*pWindow->GetDisplayContext(), reinterpret_cast<Handle>(pLandscapeEvasObject), GetIndicatorSize(_INDICATOR_ORIENTATION_LANDSCAPE));
 
                pPortraitVisualElement = new (std::nothrow) _VisualElement;
                SysTryCatch(NID_UI_CTRL, pPortraitVisualElement, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory shortage.");