Fix for missing entry in accessoriess popup

Previous refactoring removed this entry by mistake.
This patch restore full functionality of the popup.

Change-Id: I159266955c92b47146031c7b0d48864e7ebe22db

diff --git a/src/AccessoriesSwitchesPage.cpp b/src/AccessoriesSwitchesPage.cpp
index 1be70a7..63fff94 100644 (file)
--- a/src/AccessoriesSwitchesPage.cpp
+++ b/src/AccessoriesSwitchesPage.cpp
@@ -90,12 +90,12 @@ void AccessoriesSwitchesPage::captureSwitchCb(void *user_data, const char *switc
                                                        true,
                                                        std::vector<std::string>{"IDS_ACCS_UNIVERSAL_SWITCH_CANCEL", "IDS_ACCS_UNIVERSAL_SWITCH_SAVE"});
 
-       Evas_Object *layout = createLayout(ad->popup, EDJ_ACCESSORY_POPUP, GRP_ACCESSORY_POPUP);
+       Evas_Object *layout = createLayout(ad->settingPopup_->getObject(), EDJ_ACCESSORY_POPUP, GRP_ACCESSORY_POPUP);
 
        ad->entry = createEntry(layout, PRT_ACCESSORY_POPUP_ENTRY);
        elm_object_part_text_set(ad->entry, "guide", _("IDS_ACCS_UNIVERSAL_SWITCH_ADD_SWITCH_NAME"));
 
-       elm_object_content_set(ad->popup, layout);
+       elm_object_content_set(ad->settingPopup_->getObject(), layout);
 }
 
 void AccessoriesSwitchesPage::alreadyMappedSwitchPopup(SettingAccessibility *ad)

diff --git a/src/SettingPopup.cpp b/src/SettingPopup.cpp
index 4baf2b1..edeffa0 100644 (file)
--- a/src/SettingPopup.cpp
+++ b/src/SettingPopup.cpp
@@ -45,6 +45,12 @@ SettingPopup::SettingPopup(void *data, Evas_Object *parent,
        evas_object_show(popup);
        obj = popup;
 }
+
+Evas_Object *SettingPopup::getObject() const
+{
+       return obj;
+}
+
 SettingPopup::~SettingPopup()
 {
        evas_object_del(obj);

diff --git a/src/SettingPopup.hpp b/src/SettingPopup.hpp
index 38e882a..c9b7243 100644 (file)
--- a/src/SettingPopup.hpp
+++ b/src/SettingPopup.hpp
@@ -30,6 +30,7 @@ public:
                        SettingCallback response_cb, int timeout,
                        bool blocked_flag,
                        bool keygrab_flag, std::vector<std::string> buttons);
+       Evas_Object *getObject() const;
        ~SettingPopup();
 
 private: