From: Choi Munseok <ms47.choi@samsung.com>
Date: Tue, 9 Jul 2013 12:36:55 +0000 (+0900)
Subject: Fixed destroying the AppWidgetPopup
X-Git-Tag: accepted/tizen/20130912.150013^2~38
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52a37778d79d15ba0621705633cf6a52bd31d7e9;p=platform%2Fframework%2Fnative%2Fshell.git

Fixed destroying the AppWidgetPopup

Change-Id: I54ab9830e38b1235466e5a7fbf87783b41b71d35
Signed-off-by: Choi Munseok <ms47.choi@samsung.com>
---

diff --git a/src/FShell_AppWidgetFrame.cpp b/src/FShell_AppWidgetFrame.cpp
index c30cec2..0fec55c 100644
--- a/src/FShell_AppWidgetFrame.cpp
+++ b/src/FShell_AppWidgetFrame.cpp
@@ -63,6 +63,7 @@ _AppWidgetFrame::~_AppWidgetFrame(void)
 
 	__pAppWidgetLayer = null;
 	__pAppWidgetFrameRootVisualElement = null;
+	SetVisualElement(null);
 }
 
 _AppWidgetFrame*
diff --git a/src/FShell_AppWidgetLayer.cpp b/src/FShell_AppWidgetLayer.cpp
index 85b9418..70cb002 100644
--- a/src/FShell_AppWidgetLayer.cpp
+++ b/src/FShell_AppWidgetLayer.cpp
@@ -33,6 +33,7 @@
 #include <FBase_StringConverter.h>
 #include <FGrpRectangle.h>
 #include <FUiAnim_DisplayManager.h>
+#include "FUiAnim_RootVisualElement.h"
 #include "FUi_AccessibilityManager.h"
 #include "FUi_Window.h"
 #include "FShell_AppWidgetBuffer.h"
@@ -123,12 +124,26 @@ _AppWidgetLayer::_AppWidgetLayer(const Tizen::Base::String& providerId, const Fl
 
 _AppWidgetLayer::~_AppWidgetLayer(void)
 {
+	if(_pRootVisualElement)
+	{
+		_DisplayManager* pDisplayManager = _DisplayManager::GetInstance();
+		if (pDisplayManager)
+		{
+			pDisplayManager->UnregisterRoot(*_pRootVisualElement);
+		}
+		_pRootVisualElement->SetNativeLayer(null);
+		_pRootVisualElement->Destroy();
+		_EflLayer::_pRootVisualElement = null;
+		_NativeLayer::_pRootVisualElement = null;
+	}
+
 	__pRenderBuffer = null;
 	__pTempBuffer = null;
 	__pixmapId = -1;
 
 //	__pEcoreEvas.release(); // temp
 	_pEcoreEvas = null;
+	_pWindow = null;
 }
 
 result
diff --git a/src/FShell_AppWidgetPopup.cpp b/src/FShell_AppWidgetPopup.cpp
index eb960e8..866b457 100644
--- a/src/FShell_AppWidgetPopup.cpp
+++ b/src/FShell_AppWidgetPopup.cpp
@@ -148,6 +148,7 @@ _AppWidgetPopup::~_AppWidgetPopup(void)
 
 	__pAppWidgetPopupLayer = null;
 	__pAppWidgetPopupRootVisualElement = null;
+	SetVisualElement(null);
 }
 
 _AppWidgetPopup*