N_SE-47101 : send touchCancelEvent if control is disable, fix VE type window touch...

Change-Id: I9fdb99aaff797ff67f41c707e87e9170ffdf32ab

diff --git a/src/ui/FUi_EflUiEventManager.cpp b/src/ui/FUi_EflUiEventManager.cpp
index 474a03b..ba83930 100644 (file)
--- a/src/ui/FUi_EflUiEventManager.cpp
+++ b/src/ui/FUi_EflUiEventManager.cpp
@@ -751,7 +751,7 @@ private:
                                for(int i =owneeCount-1; i>=0; i--)
                                {
                                        pOwneeWindow = pWindow->GetOwnee(i);
-                                       if (pOwneeWindow && pOwneeWindow->GetVisibleState() == true)
+                                       if (pOwneeWindow && pOwneeWindow->GetVisibleState() == true && pOwneeWindow->GetEnableState())
                                        {
                                                Tizen::Graphics::Rectangle rc(pOwneeWindow->GetAbsoluteBounds(true));
                                                if ((x >= rc.x) && (x <= (rc.x + rc.width)) && (y >= rc.y) && (y <= (rc.y + rc.height)))

diff --git a/src/ui/FUi_UiTouchEvent.cpp b/src/ui/FUi_UiTouchEvent.cpp
index 1997a43..35b1056 100644 (file)
--- a/src/ui/FUi_UiTouchEvent.cpp
+++ b/src/ui/FUi_UiTouchEvent.cpp
@@ -232,17 +232,19 @@ _UiTouchEvent::GetEventType(void) const
 bool
 _UiTouchEvent::IsEventEnabled(const _Control& control) const
 {
+       if (GetTouchInfo()->GetTouchStatus() == _TOUCH_CANCELED)
+       {
+               return true;
+       }
+
        if (!_UiEvent::IsEventEnabled(control))
        {
                return false;
        }
 
-       if (GetTouchInfo()->GetTouchStatus() != _TOUCH_CANCELED)
+       if (!control.IsInputEventEnabled())
        {
-               if (!control.IsInputEventEnabled())
-               {
-                       return false;
-               }
+               return false;
        }
 
        return true;