From: Woochan Lee <wc0917.lee@samsung.com>
Date: Wed, 14 Dec 2016 10:49:34 +0000 (+0900)
Subject: Fix content is not swallowed issue.
X-Git-Tag: submit/tizen_3.0/20161223.053152^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca172609f699e6be306d2b1343b92197c41ed64c;p=platform%2Fcore%2Fuifw%2Fui-viewmgr.git

Fix content is not swallowed issue.

In the ui_view use case. the content is not swallowed
when user call set_content() when ui_view already activated.

Change-Id: I765d489ff679dce8b8a513d7f3f24eefdf3b0caf
---

diff --git a/src/lib/efl/UiBaseView.cpp b/src/lib/efl/UiBaseView.cpp
index 2145f81..7e6ab12 100644
--- a/src/lib/efl/UiBaseView.cpp
+++ b/src/lib/efl/UiBaseView.cpp
@@ -56,6 +56,11 @@ int UiBaseView::setContent(Eo *content)
 
 	if (content) {
 		evas_object_event_callback_add(content, EVAS_CALLBACK_DEL, _contentDelCb, this);
+		auto viewmgr = UI_BASE_VIEWMGR;
+		if ((viewmgr->getBase() == this->getBase()) && (this->getState() == UI_VIEW_STATE_ACTIVATE)) {
+			elm_layout_content_set(this->getBase(), "content", content);
+		}
+
 		return UiIfaceView::setContent(content);
 	}