Set all widgets defaultly visible 65/199165/12
authorOskar Chodowicz <o.chodowicz@samsung.com>
Wed, 6 Feb 2019 11:43:44 +0000 (12:43 +0100)
committerOskar Chodowicz <o.chodowicz@samsung.com>
Wed, 27 Feb 2019 10:53:51 +0000 (11:53 +0100)
Change-Id: I8d4f391015c985db8ec4d07042107697e2030781

25 files changed:
src/AccessoriesSwitchesPage.cpp
src/Box.cpp
src/Button.cpp
src/Check.cpp
src/Conformant.cpp
src/CtxPopup.cpp
src/Entry.cpp
src/Genlist.cpp
src/Icon.cpp
src/Image.cpp
src/Layout.cpp
src/MainData.cpp
src/Naviframe.cpp
src/Popup.cpp
src/Radio.cpp
src/RemoveSwitchPage.cpp
src/ScreenReaderSettingsPage.cpp
src/Scroller.cpp
src/SetValuePage.cpp
src/Slider.cpp
src/Toolbar.cpp
src/UniversalSwitchPage.cpp
src/UpdateSwitchPage.cpp
src/Widget.cpp
src/Widget.hpp

index 47d414e..f833c25 100644 (file)
@@ -28,7 +28,6 @@ AccessoriesSwitchesPage::AccessoriesSwitchesPage(SettingAccessibility *ad)
        auto naviframe = context_->md.getNaviframe();
        auto layout = Widget::make<Layout>(naviframe, EDJ_ACCESSORY, GRP_ACCESSORY);
        layout->setText(PRT_ACCESSORY_LABEL, "IDS_ACCS_UNIVERSAL_SWITCH_ADD_SWITCH_ACCESSORIES_DESC");
-       layout->show();
 
        naviframe->pushBack("IDS_ACCS_UNIVERSAL_SWITCH_ADD_SWITCH_ACCESSORIES_TITLE", layout, {}, [this]() {
                setting_accessibility_universal_switch_dbus_config_cancelCaptureSwitch(&context_->config);
@@ -39,7 +38,6 @@ AccessoriesSwitchesPage::AccessoriesSwitchesPage(SettingAccessibility *ad)
                naviframe->popBack();
        });
        prevBtn->setStyle(Button::BACK_BUTTON_ARROW_STYLE);
-       prevBtn->show();
        layout->setPartContent("prev_btn", prevBtn);
 
        context_->us_configuration.switch_id = {};
@@ -74,13 +72,11 @@ void AccessoriesSwitchesPage::newSwitchPopup()
        popup->setEextEventCallback(EEXT_CALLBACK_BACK, []() {});
 
        auto layout = Widget::make<Layout>(popup, EDJ_ACCESSORY_POPUP, GRP_ACCESSORY_POPUP);
-       layout->show();
        popup->setContent(layout);
 
        auto entry = Widget::make<Entry>(layout);
        entry->setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        entry->setPartText("guide", "IDS_ACCS_UNIVERSAL_SWITCH_ADD_SWITCH_NAME");
-       entry->show();
        layout->setPartContent(PRT_ACCESSORY_POPUP_ENTRY, entry);
 
        auto cancelBtnCb = [popup, this]() {
@@ -91,7 +87,6 @@ void AccessoriesSwitchesPage::newSwitchPopup()
 
        auto cancelBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_CANCEL", cancelBtnCb);
        cancelBtn->setStyle("popup");
-       cancelBtn->show();
        popup->setPartContent("button1", cancelBtn);
 
        auto saveBtnCb = [popup, entry, this]() {
@@ -110,9 +105,7 @@ void AccessoriesSwitchesPage::newSwitchPopup()
 
        auto saveBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_SAVE", saveBtnCb);
        saveBtn->setStyle("popup");
-       saveBtn->show();
        popup->setPartContent("button2", saveBtn);
-       popup->show();
 }
 
 void AccessoriesSwitchesPage::alreadyMappedSwitchPopup()
@@ -128,14 +121,11 @@ void AccessoriesSwitchesPage::alreadyMappedSwitchPopup()
 
        auto okBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_OK", okBtnCb);
        okBtn->setStyle("popup");
-       okBtn->show();
        popup->setPartContent("button1", okBtn);
 
        auto layout = Widget::make<Layout>(popup, EDJ_ACCESSORY_POPUP, GRP_ACCESSORY_POPUP);
        layout->setPartText(PRT_ACCESSORY_POPUP_LABEL, "IDS_ACCS_UNIVERSAL_SWITCH_ALREADY_ADDED");
-       layout->show();
        popup->setContent(layout);
-       popup->show();
 }
 
 void AccessoriesSwitchesPage::accessorySwitchActionCb(SettingAccessibility *ad, const std::string &action, void *user_data)
index 9186d48..c35e4d3 100644 (file)
@@ -4,6 +4,7 @@ Box::Box(Widget *parent)
        : Widget(parent)
 {
        uniqueObj_.reset(elm_box_add(parent->getObject()));
+       show();
 }
 
 void Box::packEnd(Widget *widget)
index 71f393e..30db1f1 100644 (file)
@@ -6,6 +6,7 @@ Button::Button(Widget *parent)
        uniqueObj_.reset(elm_button_add(parent->getObject()));
        setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        setAlignHint(EVAS_HINT_FILL, 0.5);
+       show();
 }
 
 Button::Button(Widget *parent, const TranslatedString &text, std::function<void()> onClick)
@@ -15,4 +16,5 @@ Button::Button(Widget *parent, const TranslatedString &text, std::function<void(
        setAlignHint(EVAS_HINT_FILL, 0.5);
        setText(text);
        setEvasSmartCallback("clicked", onClick);
+       show();
 }
index 50d6e3d..7ef4854 100644 (file)
@@ -4,6 +4,7 @@ Check::Check(Widget *parent)
        : Widget(parent)
 {
        uniqueObj_.reset(elm_check_add(parent->getObject()));
+       show();
 }
 
 void Check::setState(Eina_Bool state)
index 7789711..ac288e5 100644 (file)
@@ -4,4 +4,5 @@ Conformant::Conformant(Widget *parent)
        : Widget(parent)
 {
        uniqueObj_.reset(elm_conformant_add(parent->getObject()));
+       show();
 }
index dd2b303..6d5c8a1 100644 (file)
@@ -4,6 +4,7 @@ CtxPopup::CtxPopup(Widget *parent)
        : Widget(parent)
 {
        uniqueObj_.reset(elm_ctxpopup_add(parent->getObject()));
+       show();
 }
 
 void CtxPopup::setAutoHide(bool autoHide)
index be16b54..c559d5f 100644 (file)
@@ -4,6 +4,7 @@ Entry::Entry(Widget *parent)
        : Widget(parent)
 {
        uniqueObj_.reset(elm_entry_add(parent->getObject()));
+       show();
 }
 
 void Entry::setEntryText(const TranslatedString &text)
index 4068f93..87f575a 100644 (file)
@@ -5,6 +5,7 @@ Genlist::Genlist(Widget *parent)
 {
        uniqueObj_.reset(elm_genlist_add(parent->getObject()));
        parent_ = parent;
+       show();
 }
 
 void Genlist::setMode(Elm_List_Mode mode)
index d563bfc..9f02098 100644 (file)
@@ -4,4 +4,5 @@ Icon::Icon(Widget *parent)
        : Widget(parent)
 {
        uniqueObj_.reset(elm_icon_add(parent->getObject()));
+       show();
 }
index 2a0d697..a26e332 100644 (file)
@@ -4,4 +4,5 @@ Image::Image(Widget *parent)
        : Widget(parent)
 {
        uniqueObj_.reset(elm_image_add(parent->getObject()));
+       show();
 }
index 08099ab..d3d5422 100644 (file)
@@ -7,6 +7,7 @@ Layout::Layout(Widget *parent)
        : Widget(parent)
 {
        uniqueObj_.reset(elm_layout_add(parent->getObject()));
+       show();
 }
 
 Layout::Layout(Widget *parent, const std::string &edjeFile, const std::string &group)
index 0cc03f1..d1cb375 100644 (file)
@@ -70,7 +70,6 @@ int MainData::initViewWithoutGenlist(const std::string &name)
        auto conformant = Widget::make<Conformant>(window.get());
        conformant->setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        window->setConformant(true);
-       conformant->show();
        window->addResizeObject(conformant);
 
        naviframe_ = Widget::make<Naviframe>(conformant);
@@ -86,9 +85,6 @@ int MainData::initViewWithoutGenlist(const std::string &name)
        naviframe_->pushBack(name, layout_, {}, {});
        naviframe_it = naviframe_->top();
 
-       naviframe_->show();
-       layout_->show();
-
        return SETTING_RETURN_SUCCESS;
 }
 
@@ -105,7 +101,6 @@ void MainData::prepareViewList()
        genlist_ = Widget::make<Genlist>(layout_);
        genlist_->setMode(ELM_LIST_COMPRESS);
        genlist_->setStyle("dialogue");
-       genlist_->show();
 }
 
 void MainData::createMainWindow(const std::string &name)
index c407b7d..1478f5a 100644 (file)
@@ -10,6 +10,7 @@ Naviframe::Naviframe(Widget *parent)
        uniqueObj_.reset(elm_naviframe_add(parent->getObject()));
        eext_object_event_callback_add(uniqueObj_.get(), EEXT_CALLBACK_BACK, eext_naviframe_back_cb, NULL);
        eext_object_event_callback_add(uniqueObj_.get(), EEXT_CALLBACK_MORE, eext_naviframe_more_cb, NULL);
+       show();
 }
 
 void Naviframe::createPrevBtnAutomatically(bool automatically)
index 61de614..d21b49b 100644 (file)
@@ -5,6 +5,7 @@ Popup::Popup(Widget *parent)
 {
        uniqueObj_.reset(elm_popup_add(parent->getObject()));
        setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       show();
 }
 
 Popup::Popup(Widget *parent, const TranslatedString &title)
@@ -12,6 +13,7 @@ Popup::Popup(Widget *parent, const TranslatedString &title)
        uniqueObj_.reset(elm_popup_add(parent->getObject()));
        setPartText("title,text", title);
        setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       show();
 }
 
 void Popup::setOrientation(Elm_Popup_Orient orientation)
index 711f5d0..3783ffb 100644 (file)
@@ -4,6 +4,7 @@ Radio::Radio(Widget *parent)
        : Widget(parent)
 {
        uniqueObj_.reset(elm_radio_add(parent->getObject()));
+       show();
 }
 
 void Radio::addToGroup(Radio &radio)
index 3c3a27d..9f92d7c 100644 (file)
@@ -155,8 +155,6 @@ void RemoveSwitchPage::createPopupForSwitchesRemoving()
        };
        deleteSwitchBtn->setEvasSmartCallback("clicked", removeSwitchCb);
        popup->setPartContent("button2", deleteSwitchBtn);
-
-       popup->show();
 }
 
 void RemoveSwitchPage::removeSwitch(size_t item_id)
index 937c674..2d80fa4 100644 (file)
@@ -265,7 +265,6 @@ void ScreenReaderSettingsPage::mouseUpGendialListCb(void *data, Evas_Object *obj
 
        genlist->blockScrolling(Elm_Scroller_Movement_Block(ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL | ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL));
        genlist->setScrollbarsVisibility(ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
-       genlist->show();
 
        box->packEnd(genlist);
 
@@ -295,8 +294,6 @@ void ScreenReaderSettingsPage::mouseUpGendialListCb(void *data, Evas_Object *obj
        btnDone->setText("IDS_MSG_ACBUTTON_DONE_ABB");
        btnDone->setEvasSmartCallback("clicked", onDone);
        self->popup_->setPartContent("button2", btnDone);
-
-       self->popup_->show();
 }
 
 void ScreenReaderSettingsPage::vibrationFeedbackCb(void *data, Evas_Object *obj, void *event_info)
@@ -477,8 +474,6 @@ void ScreenReaderSettingsPage::createSpeechRatePopup(void *item)
        popup_->setPartContent("button2", doneBtn);
 
        evas_object_event_callback_add(popup_->getObject(), EVAS_CALLBACK_DEL, onPopupDel, item);
-
-       popup_->show();
 }
 
 void ScreenReaderSettingsPage::onPopupDel(void *data, Evas *e, Evas_Object *obj, void *event_info)
index 1272874..31f43b3 100644 (file)
@@ -4,6 +4,7 @@ Scroller::Scroller(Widget *parent)
        : Widget(parent)
 {
        uniqueObj_.reset(elm_scroller_add(parent->getObject()));
+       show();
 }
 
 void Scroller::setScrollbarsVisibility(Elm_Scroller_Policy h, Elm_Scroller_Policy v)
index 13f63a5..6b52a25 100644 (file)
@@ -401,7 +401,6 @@ Genlist *SetValuePage::createGenlist(Widget *parent, const char *title)
                createGendialTitleItem(genlist->getObject(), &itc_group_item, title);
 
        parent->setPartContent(PRT_SET_VALUE_LIST, genlist);
-       genlist->show();
 
        return genlist;
 }
@@ -475,7 +474,6 @@ Layout *SetValuePage::createLayout(Widget *parent, const std::string &layout_grp
        auto layout = Widget::make<Layout>(parent);
        layout->setFile(edj_path, layout_grp);
        layout->setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       layout->show();
 
        return layout;
 }
index 6fdcfc8..a2e4954 100644 (file)
@@ -4,6 +4,7 @@ Slider::Slider(Widget *parent)
        : Widget(parent)
 {
        uniqueObj_.reset(elm_slider_add(parent->getObject()));
+       show();
 }
 
 void Slider::showIndicator(bool show)
index 9caa153..227ecb1 100644 (file)
@@ -4,6 +4,7 @@ Toolbar::Toolbar(Widget *parent)
        : Widget(parent)
 {
        uniqueObj_.reset(elm_toolbar_add(parent->getObject()));
+       show();
 }
 
 void Toolbar::setSelectMode(Elm_Object_Select_Mode mode)
index 449bf13..189e998 100644 (file)
@@ -138,7 +138,6 @@ void UniversalSwitchPage::updateVconfKey(int state)
                        parent->removeChild(popup);
                };
                auto addBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_POPUP_ADD", addBtnCb);
-               addBtn->show();
                addBtn->setStyle("popup");
                popup->setPartContent("button1", addBtn);
 
@@ -149,10 +148,8 @@ void UniversalSwitchPage::updateVconfKey(int state)
                        parent->removeChild(popup);
                };
                auto cancelBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_CANCEL", cancelBtnCb);
-               cancelBtn->show();
                cancelBtn->setStyle("popup");
                popup->setPartContent("button2", cancelBtn);
-               popup->show();
        } else {
                setState(state);
        }
index d1a15d5..e09322b 100644 (file)
@@ -119,7 +119,6 @@ Layout *UpdateSwitchPage::createLayout(Widget *parent, const std::string &layout
        auto layout = Widget::make<Layout>(parent);
        layout->setFile(edj_path, layout_grp);
        layout->setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       layout->show();
 
        return layout;
 }
@@ -136,7 +135,6 @@ Genlist *UpdateSwitchPage::createGenlist(Widget *parent, const char *title)
                createGendialTitleItem(genlist->getObject(), &itc_group_item, title);
 
        parent->setPartContent(PRT_SET_VALUE_LIST, genlist);
-       genlist->show();
 
        return genlist;
 }
index f338e81..0a3c06f 100644 (file)
@@ -82,6 +82,11 @@ void Widget::show()
        evas_object_show(uniqueObj_.get());
 }
 
+void Widget::hide()
+{
+       evas_object_hide(uniqueObj_.get());
+}
+
 Evas_Object *Widget::getObject()
 {
        return uniqueObj_.get();
index 18c9526..0d864a5 100644 (file)
@@ -48,6 +48,7 @@ public:
        void setPartContent(const std::string &part, Widget *content);
        void emitSignal(const std::string &signal);
        void show();
+       void hide();
        Evas_Object *getObject();
        Widget *getParent();
        void addChild(std::unique_ptr<Widget> child);