Fixed Coding Idioms Violations

[platform/framework/native/uifw.git] / src / ui / controls / FUiCtrl_OverlayAgent.cpp

diff --git a/src/ui/controls/FUiCtrl_OverlayAgent.cpp b/src/ui/controls/FUiCtrl_OverlayAgent.cpp
index 60e16c3..6b79b75 100644 (file)
--- a/src/ui/controls/FUiCtrl_OverlayAgent.cpp
+++ b/src/ui/controls/FUiCtrl_OverlayAgent.cpp
@@ -295,6 +295,7 @@ _OverlayAgent::_OverlayVisualElement::SetImageObjectShowStateChanged(void)
                __pOverlayTimer->Cancel();
                __pOverlayTimer->Start(0);
                SysSecureLog(NID_UI_CTRL, "The timer is restarted.");
+               ClearLastResult();
        }
 }
 
@@ -638,7 +639,7 @@ _OverlayAgent::PutXvImage(void)
        SysTryReturnResult(NID_UI_CTRL, pDisplay != null, E_SYSTEM, "The current value of Display is null");
 
        if (__pXvImage == null || __needToRellaocImage)
-               //||(__pXvImage && __pXvImage->data_size != currentSourceBufferSize->GetCapacity()) )
+               //||(__pXvImage && __pXvImage->data_size != currentSourceBufferSize->GetCapacity()))
        {
                if (__xvPort != -1)
                {
@@ -855,7 +856,7 @@ _OverlayAgent::SetRotation(_OverlayAgentRotation rotation)
 
        //Set bounds of rotated renderer
        FloatRectangle rendererBounds = __standardRendererBounds;
-       if (rotatedZAngle == 90.0f || rotatedZAngle == 270.0f )
+       if (rotatedZAngle == 90.0f || rotatedZAngle == 270.0f)
        {
                rendererBounds.x = __standardRendererBounds.x - ((__standardRendererBounds.height - __standardRendererBounds.width) / 2.0f);
                rendererBounds.y = __standardRendererBounds.y + ((__standardRendererBounds.height - __standardRendererBounds.width) / 2.0f);
@@ -1068,6 +1069,7 @@ _OverlayAgent::CreateRendererVisualElement(const _Control& parentControl, const
        evas_object_resize(__pImageObject, physicalBounds.width, physicalBounds.height);
        evas_object_move(__pImageObject, physicalBounds.x, physicalBounds.y);
        evas_object_hide(__pImageObject);
+       pRendererVE->SetImageObject(__pImageObject);
 
 
        DisplayContext* pDisplayContext = parentControl.GetRootWindow()->GetDisplayContext();
@@ -1076,8 +1078,6 @@ _OverlayAgent::CreateRendererVisualElement(const _Control& parentControl, const
        unique_ptr<VisualElementSurface> pRendererSurface(_VisualElementSurfaceImpl::CreateSurfaceUsingExistingObjectN(*pDisplayContext, (Handle)__pImageObject, Dimension(physicalBounds.width, physicalBounds.height)));
        SysTryReturnResult(NID_UI_CTRL, pRendererSurface != null, E_SYSTEM, "[E_SYSTEM] The current value of RootWindow's DisplayContext is null.");
 
-       pRendererVE->SetImageObject(__pImageObject);
-
        r = pRendererVE->SetSurface(pRendererSurface.release());
        SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -1105,7 +1105,7 @@ _OverlayAgent::CreatePixmap(const Rectangle& physicalBounds)
                E_SYSTEM, "input size (%d, %d) is too small to create a pixmap",pixmapSize.width, pixmapSize.height);
 
        // Create pixmap
-       Display *pDisplay = (Display*)ecore_x_display_get();
+       Display* pDisplay = (Display*)ecore_x_display_get();
        SysTryReturnResult(NID_UI_CTRL, pDisplay != null, E_SYSTEM, "The current value of Display is null");
 
        __pixmap = XCreatePixmap(pDisplay, DefaultRootWindow(pDisplay), pixmapSize.width, pixmapSize.height, DefaultDepth(pDisplay, DefaultScreen(pDisplay)));
@@ -1248,7 +1248,7 @@ _OverlayAgent::GetPixelFormatListN(void)
                __OverlayAgentBufferPixelFormat[0] = set;
        }
 
-       std::unique_ptr< ArrayListT<bool> > pFormatList( new (std::nothrow) ArrayListT<bool>());
+       std::unique_ptr< ArrayListT<bool> > pFormatList(new (std::nothrow) ArrayListT<bool>());
        SysTryReturn(NID_UI_CTRL, pFormatList != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] failed to create a list instance");
 
        result r = pFormatList->Construct();