Fix password popup parent object

Change-Id: I50ed2a548fae5e6a1c76aa973aa5633e68dc01d2
Signed-off-by: s414kim <s414.kim@samsung.com>

diff --git a/tools/apps/ode/src/interface/external/decrypt-sdcard.cpp b/tools/apps/ode/src/interface/external/decrypt-sdcard.cpp
index 2fdcfa3..d0b92c0 100644 (file)
--- a/tools/apps/ode/src/interface/external/decrypt-sdcard.cpp
+++ b/tools/apps/ode/src/interface/external/decrypt-sdcard.cpp
@@ -38,7 +38,7 @@ void DecryptSDCardInfo::setPartContent()
 
        changePasswordButton.setText(dgetText("IDS_ST_BUTTON_CHANGE_PASSWORD_ABB2"));
        changePasswordButton.onClick = [this](void *) {
-               passwordChange.reset(new PasswordChange(this));
+               passwordChange.reset(new PasswordChange(frame));
                passwordChange->show();
        };
        content->setContent("password_button", &changePasswordButton);

diff --git a/tools/apps/ode/src/interface/external/encrypt-sdcard.cpp b/tools/apps/ode/src/interface/external/encrypt-sdcard.cpp
index d8f2f28..f09f85c 100644 (file)
--- a/tools/apps/ode/src/interface/external/encrypt-sdcard.cpp
+++ b/tools/apps/ode/src/interface/external/encrypt-sdcard.cpp
@@ -106,7 +106,7 @@ void EncryptSDCardCheck::setPartContent()
        createButton.setText(dgetText("IDS_ST_BUTTON_CREATE_PASSWORD"));
        createButton.setStyle("auto_expand");
        createButton.onClick = [this](void *) {
-               password.reset(new PasswordCreate(this));
+               password.reset(new PasswordCreate(frame));
                password->onResult.connect(this, &EncryptSDCardCheck::passwordResultCallback);
                password->show();
        };
@@ -114,7 +114,7 @@ void EncryptSDCardCheck::setPartContent()
 
        changeButton.setText(dgetText("IDS_ST_BUTTON_CHANGE_PW_ABB"));
        changeButton.onClick = [this](void *) {
-               password.reset(new PasswordChange(this));
+               password.reset(new PasswordChange(frame));
                password->onResult.connect(this, &EncryptSDCardCheck::passwordResultCallback);
                password->show();
        };
@@ -122,7 +122,7 @@ void EncryptSDCardCheck::setPartContent()
 
        deleteButton.setText(dgetText("IDS_ST_BUTTON_DELETE_PW_ABB"));
        deleteButton.onClick = [this](void *) {
-               password.reset(new PasswordDelete(this));
+               password.reset(new PasswordDelete(frame));
                password->onResult.connect(this, &EncryptSDCardCheck::passwordResultCallback);
                password->show();
        };

diff --git a/tools/apps/ode/src/interface/page.cpp b/tools/apps/ode/src/interface/page.cpp
index 055195e..2bcc7e2 100644 (file)
--- a/tools/apps/ode/src/interface/page.cpp
+++ b/tools/apps/ode/src/interface/page.cpp
@@ -19,7 +19,7 @@
 #include "page.h"
 
 Page::Page(Widget *parent, const std::string &name, int type)
-       : Layout(parent), nextButton(nullptr), prevButton(nullptr), content(nullptr), bottom(nullptr)
+       : Layout(parent), nextButton(nullptr), prevButton(nullptr), content(nullptr), bottom(nullptr), frame(parent)
 {
        setEDJPath("org.tizen.ode.edj");
        setFile(edjFile, "base_layout");

diff --git a/tools/apps/ode/src/interface/page.h b/tools/apps/ode/src/interface/page.h
index 543af40..1aa08f1 100644 (file)
--- a/tools/apps/ode/src/interface/page.h
+++ b/tools/apps/ode/src/interface/page.h
@@ -48,6 +48,7 @@ protected:
        std::unique_ptr<Layout> content;
        std::unique_ptr<Layout> bottom;
        std::string edjFile;
+       Widget *frame;
 private:
        void initialize(const std::string &name, int type);
 };