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 (file)
--- 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);
        }