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 e4e5c64..6b79b75 100644 (file)
--- a/src/ui/controls/FUiCtrl_OverlayAgent.cpp
+++ b/src/ui/controls/FUiCtrl_OverlayAgent.cpp
@@ -184,6 +184,8 @@ OnEvasImageDamaged(void* pData, Evas_Object* pImageObject)
        Dimension rendererImageSize(0,0);
        evas_object_image_size_get(pRendererImageObject, &rendererImageSize.width, &rendererImageSize.height);
 
+       //pOverlayAgent->SetRendererFlushNeeded();
+
        if (!newImageSize.Equals(rendererImageSize))
        {
                SysSecureLog(NID_UI_CTRL,"newImageSize [%d, %d] rendererImageSize [%d, %d]", newImageSize.width, newImageSize.height, rendererImageSize.width, rendererImageSize.height);
@@ -217,7 +219,7 @@ struct visualElementDeleter
 };
 
 _OverlayAgent::_OverlayVisualElement::_OverlayVisualElement(void)
-       : __pTimer(null)
+       : __pOverlayTimer(null)
        , __pImageObject(null)
        , __showStateChanged(false)
 {
@@ -225,7 +227,7 @@ _OverlayAgent::_OverlayVisualElement::_OverlayVisualElement(void)
 
 _OverlayAgent::_OverlayVisualElement::_OverlayVisualElement(const _OverlayVisualElement& rhs)
        : _VisualElement(rhs)
-       , __pTimer(null)
+       , __pOverlayTimer(null)
        , __pImageObject(rhs.__pImageObject)
        , __showStateChanged(rhs.__showStateChanged)
 {
@@ -233,11 +235,11 @@ _OverlayAgent::_OverlayVisualElement::_OverlayVisualElement(const _OverlayVisual
 
 _OverlayAgent::_OverlayVisualElement::~_OverlayVisualElement(void)
 {
-       if (__pTimer)
+       if (__pOverlayTimer)
        {
-               __pTimer->Cancel();
-               delete __pTimer;
-               __pTimer = null;
+               __pOverlayTimer->Cancel();
+               delete __pOverlayTimer;
+               __pOverlayTimer = null;
        }
 
        if (__pImageObject)
@@ -250,10 +252,10 @@ _OverlayAgent::_OverlayVisualElement::~_OverlayVisualElement(void)
 result
 _OverlayAgent::_OverlayVisualElement::Construct(void)
 {
-       if (!__pTimer)
+       if (!__pOverlayTimer)
        {
-               __pTimer = new (nothrow) Timer();
-               __pTimer->Construct(*this);
+               __pOverlayTimer = new (nothrow) Timer();
+               __pOverlayTimer->Construct(*this);
        }
 
        return _VisualElement::Construct();
@@ -288,7 +290,13 @@ _OverlayAgent::_OverlayVisualElement::SetImageObjectShowStateChanged(void)
 {
        __showStateChanged = true;
 
-       __pTimer->Start(0);
+       if (IsFailed(__pOverlayTimer->Start(0)))
+       {
+               __pOverlayTimer->Cancel();
+               __pOverlayTimer->Start(0);
+               SysSecureLog(NID_UI_CTRL, "The timer is restarted.");
+               ClearLastResult();
+       }
 }
 
 void
@@ -322,12 +330,16 @@ _OverlayAgent::_OverlayVisualElement::CloneN(void) const
 void
 _OverlayAgent::_OverlayVisualElement::OnTimerExpired(Timer& timer)
 {
-       if (__showStateChanged && __pImageObject)
+       if (&timer == __pOverlayTimer && __showStateChanged && __pImageObject)
        {
                SetShowState(evas_object_visible_get(__pImageObject));
                __showStateChanged = false;
                SysSecureLog(NID_UI_CTRL, "Updates show state of Renderer VisualElement");
        }
+       else
+       {
+               SysSecureLog(NID_UI_CTRL, "The state of timer is invalid.");
+       }
 }
 
 _OverlayAgent*
@@ -627,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)
                {
@@ -844,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);
@@ -1056,7 +1068,7 @@ _OverlayAgent::CreateRendererVisualElement(const _Control& parentControl, const
        evas_object_image_filled_set(__pImageObject, EINA_TRUE);
        evas_object_resize(__pImageObject, physicalBounds.width, physicalBounds.height);
        evas_object_move(__pImageObject, physicalBounds.x, physicalBounds.y);
-       evas_object_show(__pImageObject);
+       evas_object_hide(__pImageObject);
        pRendererVE->SetImageObject(__pImageObject);
 
 
@@ -1093,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)));
@@ -1236,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();
@@ -1386,6 +1398,8 @@ _OverlayAgent::EvaluateBounds(OverlayAgentEvaluationOption option, FloatRectangl
 
        FloatRectangle originalInputRect(rect);
        rect = _CoordinateSystemUtils::ConvertToFloat(_CoordinateSystemUtils::InverseTransform(physicalRect));
+       rect.x = originalInputRect.x;
+       rect.y = originalInputRect.y;
 
        if (rect != originalInputRect)
        {