From: Jaewon Cho <jaewon7.cho@samsung.com>
Date: Wed, 7 Aug 2013 01:26:58 +0000 (+0900)
Subject: Return null for Control::GetControlAnimator() if it's Window instance
X-Git-Tag: accepted/tizen/20131002.165803^2~497^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1094d597d9ad7d36ec46a6388904f65b6cc7efc4;p=platform%2Fframework%2Fnative%2Fuifw.git

Return null for Control::GetControlAnimator() if it's Window instance

Change-Id: I0d7ed0d90cf32b9b258b3357610485883dc40b45
Signed-off-by: Jaewon Cho <jaewon7.cho@samsung.com>
---

diff --git a/src/ui/FUi_ControlImpl.cpp b/src/ui/FUi_ControlImpl.cpp
index 7eb6ff5..2e582d6 100644
--- a/src/ui/FUi_ControlImpl.cpp
+++ b/src/ui/FUi_ControlImpl.cpp
@@ -4324,7 +4324,14 @@ _ControlImpl::GetControlAnimator(void) const
 
 	if ((IsMovable() == false) && (IsResizable() == false))
 	{
-		SysLog(NID_UI, "Control is not animatable.\n");
+		SysLog(NID_UI, "Control is not animatable.");
+		return null;
+	}
+
+	const _WindowImpl* pWindowImpl = dynamic_cast <const _WindowImpl*>(this);
+	if (pWindowImpl != null)
+	{
+		SysLog(NID_UI, "Window is not animatable.");
 		return null;
 	}