fix nativeWindow handling on the quickpanel

Change-Id: Ie1f541a3ff3740aa7c1a039bbca593d5b5bcb953

diff --git a/src/ui/FUi_EflUiEventManager.cpp b/src/ui/FUi_EflUiEventManager.cpp
index 5814238..56ac1f1 100644 (file)
--- a/src/ui/FUi_EflUiEventManager.cpp
+++ b/src/ui/FUi_EflUiEventManager.cpp
@@ -422,8 +422,7 @@ private:
                while (pParent)
                {
                        _Window* pWindow = dynamic_cast<_Window*>(pParent);
-                       if (pWindow
-                               && (pWindow->GetNativeWindowActivated() == true || (pWindow->GetNativeWindowActivated() == false && pWindow->GetWindowType() == _WINDOW_TYPE_VE)))
+                       if (pWindow && (pWindow->GetNativeWindowActivated() == true))
                        {
                                nativeWindowActivated = true;
                                break;

diff --git a/src/ui/FUi_Window.cpp b/src/ui/FUi_Window.cpp
index 1cd9442..67be6e5 100644 (file)
--- a/src/ui/FUi_Window.cpp
+++ b/src/ui/FUi_Window.cpp
@@ -434,7 +434,14 @@ _Window::SetNativeWindowActivated(bool activated)
 bool
 _Window::GetNativeWindowActivated(void)
 {
-       return __nativeWindowActivated;
+       if ((GetWindowType() == _WINDOW_TYPE_VE) || IsSystemWindow())
+       {
+               return true;
+       }
+       else
+       {
+               return __nativeWindowActivated;
+       }
 }
 
 _RootVisualElement*