TizenRefApp-8906 [Gallery] Change default value isOwner for widgets from

"false" to "true" value

Change-Id: I0a9ea1ad47abb2addea5197292ea8c6f1907e2d6

diff --git a/src/presenters/AlertDialog.cpp b/src/presenters/AlertDialog.cpp
index 26d9bcdaeb8806706aa4ddbbd5d662f39d022539..e8e7c9a7f2dada4ec076a436db1392965c95ac89 100644 (file)
--- a/src/presenters/AlertDialog.cpp
+++ b/src/presenters/AlertDialog.cpp
@@ -150,6 +150,7 @@ namespace gallery {
        {
                const auto layout = Layout::Builder().
                                setTheme(theme).
+                               setIsOwner(false).
                                build(*m_popup);
                if (!layout) {
                        LOG_RETURN(RES_FAIL, "Layout::build() failed!");
@@ -188,13 +189,15 @@ namespace gallery {
                        const EdjePart part, const ElmStyle btnStyle,
                        const LayoutTheme iconTheme, const TString &text)
        {
-               const auto btn = makeShared<StyledWidget>(elm_button_add(*m_popup));
+               const auto btn = makeShared<StyledWidget>(
+                               elm_button_add(*m_popup), false);
                btn->setStyle(btnStyle);
                m_popup->setContent(*btn, part);
 
                if (isValid(iconTheme)) {
                        const auto icon = Layout::Builder().
                                        setTheme(iconTheme).
+                                       setIsOwner(false).
                                        build(*btn);
                        if (!icon) {
                                LOG_RETURN(RES_FAIL, "Layout::build() failed!");

diff --git a/src/presenters/Dialog.cpp b/src/presenters/Dialog.cpp
index 33d415c9f9cb4a9605470dcbbc6955950d5b70d0..0c15e9f340b0714c1f90909d4e3f328372fc0269 100644 (file)
--- a/src/presenters/Dialog.cpp
+++ b/src/presenters/Dialog.cpp
@@ -34,7 +34,7 @@ namespace gallery {
                        LOG_RETURN(RES_FAIL, "elm_popup_add() failed!");
                }
 
-               m_popup = makeShared<StyledWidget>(popupEo, true);
+               m_popup = makeShared<StyledWidget>(popupEo);
 
                m_popup->addEventHandler(POPUP_DISMISSED, WEAK_DELEGATE(
                                Dialog::onPopupDismissed, asWeak(*this)));

diff --git a/src/presenters/MoreOptionsPresenter.cpp b/src/presenters/MoreOptionsPresenter.cpp
index f444293690e5e4277ebacc89ee6197e301b161aa..bae6640c5d72604e013f5d0dead924927fadcec4 100644 (file)
--- a/src/presenters/MoreOptionsPresenter.cpp
+++ b/src/presenters/MoreOptionsPresenter.cpp
@@ -172,6 +172,7 @@ namespace gallery {
                if (isValid(option.iconTheme)) {
                        const auto icon = Layout::Builder().
                                        setTheme(option.iconTheme).
+                                       setIsOwner(false).
                                        build(*m_widget);
                        if (!icon) {
                                LOG_RETURN(RES_FAIL, "Layout::build() failed!");

diff --git a/src/presenters/NoContentPage.cpp b/src/presenters/NoContentPage.cpp
index 597e51310f6a49e2d1bf23519eb4322ef29a87ed..b7a96db5036c411c51e5e61253fef21057f1f9a2 100644 (file)
--- a/src/presenters/NoContentPage.cpp
+++ b/src/presenters/NoContentPage.cpp
@@ -86,7 +86,6 @@ namespace gallery {
        Result NoContentPage::doPrepare(NaviItem &item)
        {
                const auto layout = Layout::Builder().
-                               setIsOwner(true).
                                setTheme(LAYOUT_NO_CONTENTS).
                                build(getNaviframe());
                if (!layout) {
@@ -95,6 +94,7 @@ namespace gallery {
 
                const auto icon = Layout::Builder().
                                setTheme(getImageTheme(ICON_NO_PHOTOS)).
+                               setIsOwner(false).
                                build(*layout);
                if (!icon) {
                        LOG_RETURN(RES_FAIL, "Layout::build() failed!");

diff --git a/src/presenters/ProcessingPresenter.cpp b/src/presenters/ProcessingPresenter.cpp
index d3c71e5e923d4eb88dea43a82fb8c3fde9499823..b8f1b0532214a3e29a602025630899339a99bd7d 100644 (file)
--- a/src/presenters/ProcessingPresenter.cpp
+++ b/src/presenters/ProcessingPresenter.cpp
@@ -137,7 +137,6 @@ namespace gallery {
        {
                m_widget = Layout::Builder().
                                setTheme(impl::LAYOUT_PROCESSING_WIDGET).
-                               setIsOwner(true).
                                build(parent);
                if (!m_widget) {
                        LOG_RETURN(RES_FAIL, "Layout::build() failed!");
@@ -187,7 +186,7 @@ namespace gallery {
                        LOG_RETURN(RES_FAIL, "elm_popup_add() failed!");
                }
 
-               m_popup = makeShared<StyledWidget>(popupEo, true);
+               m_popup = makeShared<StyledWidget>(popupEo);
                m_popup->setStyle(impl::POPUP_STYLE);
 
                m_popup->addEventHandler(POPUP_DISMISSED, WEAK_DELEGATE(
@@ -203,6 +202,7 @@ namespace gallery {
        {
                const auto icon = Layout::Builder().
                                setTheme(impl::LAYOUT_POPUP_ICON).
+                               setIsOwner(false).
                                build(*m_popup);
                if (!icon) {
                        LOG_RETURN(RES_FAIL, "Layout::build() failed!");

diff --git a/src/presenters/SelectModePresenter.cpp b/src/presenters/SelectModePresenter.cpp
index a63c624c4f7d51faf8eeb189639f944a1f4e76b8..385a2d5b46c259eb5a4ae5240a29dce082339fd4 100644 (file)
--- a/src/presenters/SelectModePresenter.cpp
+++ b/src/presenters/SelectModePresenter.cpp
@@ -102,8 +102,7 @@ namespace gallery {
                FAIL_RETURN(GuiPresenter::prepare(parent, PF_DEACTIVATOR),
                                "GuiPresenter::prepare() failed!");
 
-               m_selectButton = makeShared<StyledWidget>(
-                               elm_button_add(*m_content), true);
+               m_selectButton = makeShared<StyledWidget>(elm_button_add(*m_content));
                m_selectButton->setStyle(impl::SELECT_BTN_STYLE);
                m_content->set(*m_selectButton, PageContent::Part::SELECT_BUTTON);
                m_content->setSelectButtonVisible(false);
@@ -114,7 +113,7 @@ namespace gallery {
 
                if ((m_flags & FLAG_NO_BOTTOM_BUTTON) == 0) {
                        m_bottomButton = makeShared<StyledWidget>(
-                                       elm_button_add(*m_content), true);
+                                       elm_button_add(*m_content));
                        m_bottomButton->setStyle(impl::BOTTOM_BTN_STYLE);
                        hide(*m_bottomButton);
 
@@ -252,7 +251,7 @@ namespace gallery {
        {
                m_isPopupDismissed = false;
 
-               m_popup = makeShared<StyledWidget>(elm_ctxpopup_add(*m_content), true);
+               m_popup = makeShared<StyledWidget>(elm_ctxpopup_add(*m_content));
                m_popup->setStyle(impl::SELECT_POPUP_STYLE);
 
                elm_ctxpopup_direction_priority_set(*m_popup,

diff --git a/src/presenters/VideoPlayerPage.cpp b/src/presenters/VideoPlayerPage.cpp
index cbc1192044a7ef5cdc953bac71cc3f16f7a86692..19858a0dc4e25a5ad3761e9dbf01c2d189e776e8 100644 (file)
--- a/src/presenters/VideoPlayerPage.cpp
+++ b/src/presenters/VideoPlayerPage.cpp
@@ -193,7 +193,6 @@ namespace gallery {
        {
                m_content = Layout::Builder().
                                setTheme(impl::LAYOUT_VIDEO_PLAYER).
-                               setIsOwner(true).
                                build(getNaviframe());
                if (!m_content) {
                        LOG_RETURN(RES_FAIL, "m_content is NULL");
@@ -342,7 +341,8 @@ namespace gallery {
        StyledWidgetSRef VideoPlayerPage::createButton(const ElmStyle style,
                        const EdjePart part, const WidgetEventHandler &handler)
        {
-               const auto btn = makeShared<StyledWidget>(elm_button_add(*m_content));
+               const auto btn = makeShared<StyledWidget>(
+                               elm_button_add(*m_content), false);
                btn->setStyle(style);
                show(*btn);
 

diff --git a/src/view/ImageGrid.cpp b/src/view/ImageGrid.cpp
index bce22f37bd80fb6a7edd3c3bf2d4ca385f7a1770..4d7c10c17d1254d4bd16b85b78e7463fb2404fae 100644 (file)
--- a/src/view/ImageGrid.cpp
+++ b/src/view/ImageGrid.cpp
@@ -745,10 +745,10 @@ namespace gallery {
 
        ImageGrid::ImageGrid(IRefCountObj *const rc, Evas_Object *const scroller,
                        const Type type, const bool selectModeStartup) :
-               ElmWidget(rc, scroller, true),
+               ElmWidget(rc, scroller),
                m_info(getInfo(type)),
 
-               m_scroller(makeShared<StyledWidget>(scroller).get()),
+               m_scroller(makeShared<StyledWidget>(scroller, false).get()),
                m_box(elm_box_add(*m_scroller)),
                m_rect1(evas_object_rectangle_add(m_box.getEvas())),
                m_rect2(evas_object_rectangle_add(m_box.getEvas())),

diff --git a/src/view/ImageViewer.cpp b/src/view/ImageViewer.cpp
index 6a530088ccca6c2701d1ce8c761682837ba34cf5..da3a0c2522447e6bc5375253075cd5b639b66137 100644 (file)
--- a/src/view/ImageViewer.cpp
+++ b/src/view/ImageViewer.cpp
@@ -77,9 +77,9 @@ namespace gallery {
        ImageViewer::ImageViewer(IRefCountObj &rc, Evas_Object *const scroller,
                        const std::string &highResPath, const int loadSize,
                        const bool forceLoad) :
-               ElmWidget(&rc, scroller, true),
+               ElmWidget(&rc, scroller),
 
-               m_scroller(makeShared<StyledWidget>(scroller).get()),
+               m_scroller(makeShared<StyledWidget>(scroller, false).get()),
                m_layout(elm_layout_add(*m_scroller)),
                m_grid(evas_object_grid_add(m_layout.getEvas())),
                m_lowResImage(evas_object_image_filled_add(m_grid.getEvas())),

diff --git a/src/view/PageContent.cpp b/src/view/PageContent.cpp
index 32db59e6d2b7587b61bc861c4159b2ad0ca3b2e4..1ef000536b8d0f12f5009d55abfad9cece0a6b8e 100644 (file)
--- a/src/view/PageContent.cpp
+++ b/src/view/PageContent.cpp
@@ -76,7 +76,6 @@ namespace gallery {
        {
                auto layout = Layout::Builder().
                                setTheme(impl::LAYOUT_MORE_OPTIONS).
-                               setIsOwner(true).
                                build(parent);
                if (!layout) {
                        LOG_RETURN_VALUE(RES_FAIL, {}, "Layout::build() failed!");
@@ -93,7 +92,7 @@ namespace gallery {
 
        PageContent::PageContent(IRefCountObj &rc,
                        const LayoutSRef &layout, const int flags) :
-               ElmWidget(&rc, *layout, true),
+               ElmWidget(&rc, *layout),
                m_mainLayout(layout.get())
        {
                prepare(flags);
@@ -113,16 +112,20 @@ namespace gallery {
                        m_selectMode = Layout::Builder().
                                setTheme(impl::LAYOUT_SELECT_MODE).
                                build(*parent);
-                       parent->setContent(*m_selectMode);
-                       parent = m_selectMode.get();
+                       if (m_selectMode) {
+                               parent->setContent(*m_selectMode);
+                               parent = m_selectMode.get();
+                       }
                }
 
                if (flags & FLAG_BOTTOM_BUTTON) {
                        m_bottomButton = Layout::Builder().
                                setTheme(impl::LAYOUT_BOTTOM_BUTTON).
                                build(*parent);
-                       parent->setContent(*m_bottomButton);
-                       parent = m_bottomButton.get();
+                       if (m_bottomButton) {
+                               parent->setContent(*m_bottomButton);
+                               parent = m_bottomButton.get();
+                       }
                }
        }
 

diff --git a/src/view/helpers.cpp b/src/view/helpers.cpp
index f9361da72b8a74eefa70d5a2987df99b2ad73d0d..393e3de66932ee5978e6e1c8574f188561eeb37c 100644 (file)
--- a/src/view/helpers.cpp
+++ b/src/view/helpers.cpp
@@ -80,7 +80,6 @@ namespace gallery { namespace util {
        {
                const auto result = Layout::Builder().
                                setTheme(impl::LAYOUT_FAKE_ACCESS_OBJECT).
-                               setIsOwner(true).
                                setNeedBindToEo(true).
                                build(parent);
                if (!result) {

diff --git a/ucl/inc/ucl/gui/EdjeWidget.h b/ucl/inc/ucl/gui/EdjeWidget.h
index 0ee57f0ba50914b2ebead238248654b373328942..8d045c4ba7183d24f42732fc260d22e81945092f 100644 (file)
--- a/ucl/inc/ucl/gui/EdjeWidget.h
+++ b/ucl/inc/ucl/gui/EdjeWidget.h
@@ -43,7 +43,7 @@ namespace ucl {
                                EdjeSignalSrc(""));
 
        protected:
-               EdjeWidget(IRefCountObj *rc, Evas_Object *eo, bool isOwner = false);
+               EdjeWidget(IRefCountObj *rc, Evas_Object *eo, bool isOwner = true);
        };
 }
 

diff --git a/ucl/inc/ucl/gui/ElmWidget.h b/ucl/inc/ucl/gui/ElmWidget.h
index 3856b497852fc41fc2b9d087e534fd589672b86b..f967cc3d6ff9e70465c16b6cb662d682025da0df 100644 (file)
--- a/ucl/inc/ucl/gui/ElmWidget.h
+++ b/ucl/inc/ucl/gui/ElmWidget.h
@@ -31,7 +31,7 @@ namespace ucl {
 
        class ElmWidget : public Widget {
        public:
-               explicit ElmWidget(Evas_Object *eo, bool isOwner = false);
+               explicit ElmWidget(Evas_Object *eo, bool isOwner = true);
                virtual ~ElmWidget();
 
                void setEnabled(bool value);
@@ -48,7 +48,7 @@ namespace ucl {
 
        protected:
                friend class ReffedObj<ElmWidget>;
-               ElmWidget(IRefCountObj *rc, Evas_Object *eo, bool isOwner = false);
+               ElmWidget(IRefCountObj *rc, Evas_Object *eo, bool isOwner = true);
 
                virtual void setFocusedImpl(bool value) final override;
                virtual bool isFocusedImpl() const final override;

diff --git a/ucl/inc/ucl/gui/Genlist.h b/ucl/inc/ucl/gui/Genlist.h
index ebbb43e6d0664b35e6c3f1e71b0efa5ba46f4304..366eccf2c2bf245201495a8d90fa522c9e447872 100644 (file)
--- a/ucl/inc/ucl/gui/Genlist.h
+++ b/ucl/inc/ucl/gui/Genlist.h
@@ -24,7 +24,7 @@ namespace ucl {
 
        UCL_DECLARE_REF_ALIASES(Genlist);
 
-       class Genlist : public StyledWidget {
+       class Genlist final : public StyledWidget {
        public:
                enum class Mode {
                        COMPRESS = ELM_LIST_COMPRESS,

diff --git a/ucl/inc/ucl/gui/Genlist.hpp b/ucl/inc/ucl/gui/Genlist.hpp
index d3cfed046efe40c5e534de01109e0387e87192f9..3c93031aecf5acd3fe759172273926fd9732f153 100644 (file)
--- a/ucl/inc/ucl/gui/Genlist.hpp
+++ b/ucl/inc/ucl/gui/Genlist.hpp
@@ -21,7 +21,7 @@ namespace ucl {
        inline Genlist::Builder::Builder() :
                m_mode(Mode::COMPRESS),
                m_isHomogeneous(true),
-               m_isOwner(false),
+               m_isOwner(true),
                m_needBindToEo(false)
        {
        }

diff --git a/ucl/inc/ucl/gui/Layout.h b/ucl/inc/ucl/gui/Layout.h
index 9eb108e7cfacb66545e4880102ac126b25e8d506..d349f9234906aaeaf1224db70245de47e5b2fb69 100644 (file)
--- a/ucl/inc/ucl/gui/Layout.h
+++ b/ucl/inc/ucl/gui/Layout.h
@@ -44,7 +44,7 @@ namespace ucl {
        public:
                friend class ReffedObj<Layout>;
                using EdjeWidget::EdjeWidget;
-               explicit Layout(Evas_Object *eo, bool isOwner = false);
+               explicit Layout(Evas_Object *eo, bool isOwner = true);
 
                bool setTheme(const LayoutTheme &theme);
                bool setEdjeFile(const std::string &filePath, EdjeGroup group);

diff --git a/ucl/inc/ucl/gui/Layout.hpp b/ucl/inc/ucl/gui/Layout.hpp
index e3df1dbbf69d4379e333f26282aac08fb16bcd57..d6d18a34c393513bbc2cd810e531f47cf59a5c91 100644 (file)
--- a/ucl/inc/ucl/gui/Layout.hpp
+++ b/ucl/inc/ucl/gui/Layout.hpp
@@ -19,7 +19,7 @@ namespace ucl {
        // Layout::Builder //
 
        inline Layout::Builder::Builder() :
-               m_isOwner(false),
+               m_isOwner(true),
                m_needBindToEo(false)
        {
        }

diff --git a/ucl/inc/ucl/gui/StyledWidget.h b/ucl/inc/ucl/gui/StyledWidget.h
index 2a0280ca4ef937d1f523afc999d21f3e44516212..223a2933887a20a8bd1e78b4b6ebbc80ef2d9b7c 100644 (file)
--- a/ucl/inc/ucl/gui/StyledWidget.h
+++ b/ucl/inc/ucl/gui/StyledWidget.h
@@ -27,7 +27,7 @@ namespace ucl {
        public:
                friend class ReffedObj<StyledWidget>;
                using EdjeWidget::EdjeWidget;
-               explicit StyledWidget(Evas_Object *eo, bool isOwner = false);
+               explicit StyledWidget(Evas_Object *eo, bool isOwner = true);
 
                void setStyle(ElmStyle style);
        };

diff --git a/ucl/inc/ucl/gui/Widget.h b/ucl/inc/ucl/gui/Widget.h
index e60c5ec74451012407751e35bdaa677338d27535..ac47866615a4b8091847e1fe09f26ba5aec795e8 100644 (file)
--- a/ucl/inc/ucl/gui/Widget.h
+++ b/ucl/inc/ucl/gui/Widget.h
@@ -35,7 +35,7 @@ namespace ucl {
                static constexpr auto FILL = EVAS_HINT_FILL;
 
        public:
-               explicit Widget(Evas_Object *eo, bool isOwner = false);
+               explicit Widget(Evas_Object *eo, bool isOwner = true);
                virtual ~Widget();
 
                void bindToEo();
@@ -98,7 +98,7 @@ namespace ucl {
 
        protected:
                friend class ReffedObj<Widget>;
-               Widget(IRefCountObj *rc, Evas_Object *eo, bool isOwner = false);
+               Widget(IRefCountObj *rc, Evas_Object *eo, bool isOwner = true);
 
                virtual void setFocusedImpl(bool value);
                virtual bool isFocusedImpl() const;

diff --git a/ucl/src/appfw/UIApp.cpp b/ucl/src/appfw/UIApp.cpp
index 4e1a4deca3be6e2c3af7ceefdae809180cd9d033..6f49c2b386f79114b68a32f8e42e076960d9d083 100644 (file)
--- a/ucl/src/appfw/UIApp.cpp
+++ b/ucl/src/appfw/UIApp.cpp
@@ -158,7 +158,6 @@ namespace ucl {
                m_window = Window::Builder().
                                setType(winType).
                                setName(paramValue.asString().get()).
-                               setIsOwner(true).
                                build();
                if (!m_window) {
                        LOG_RETURN(RES_FAIL, "Window::Builder().build() Failed!");

diff --git a/ucl/src/gui/Naviframe.cpp b/ucl/src/gui/Naviframe.cpp
index 69d80a5419bebdbee2adafe4cb33e934a3c3035a..717940b8f7774ed8eca1d6d2820c1364ac3f9581 100644 (file)
--- a/ucl/src/gui/Naviframe.cpp
+++ b/ucl/src/gui/Naviframe.cpp
@@ -48,7 +48,7 @@ namespace ucl {
        // Naviframe //
 
        Naviframe::Naviframe(IRefCountObj &rc, Evas_Object *eo) :
-               StyledWidget(&rc, eo, true),
+               StyledWidget(&rc, eo),
                m_isInTransition(false)
        {
                addEventHandler(NAVI_TRANSITION_FINISHED, WEAK_DELEGATE(

diff --git a/ucl/src/mvp/ListPresenter.cpp b/ucl/src/mvp/ListPresenter.cpp
index 48bf3166ced6e459379315f964a73764183ebcc4..28356976d58cd21035bfb070261138cf90352141 100644 (file)
--- a/ucl/src/mvp/ListPresenter.cpp
+++ b/ucl/src/mvp/ListPresenter.cpp
@@ -113,7 +113,6 @@ namespace ucl {
                                setStyle(style).
                                setMode(Genlist::Mode::COMPRESS).
                                setHomogeneous(flags & FLAG_HOMOGENEOUS).
-                               setIsOwner(true).
                                setNeedBindToEo(true).
                                build(parentWidget);
                if (!m_genlist) {