More option shows enable in message compose screen while invalid popup is on the...

Change-Id: If476d9f821e660bb074638c5c7bdfcd0e523250a
Signed-off-by: GAURAV JAIN <gaurav.j3@samsung.com>

diff --git a/inc/MsgRecipientPanel.h b/inc/MsgRecipientPanel.h
index f2c3482..64d91d3 100644 (file)
--- a/inc/MsgRecipientPanel.h
+++ b/inc/MsgRecipientPanel.h
@@ -219,6 +219,7 @@ private:
        bool __isWindowDeactivated;
        bool __isResponseReceived;
        Tizen::Base::Collection::IList* __pRecipientList;
+       bool __isPopupExist;
 };
 
 #endif //_MSG_RECIPIENT_PANEL_H_

diff --git a/src/MsgRecipientPanel.cpp b/src/MsgRecipientPanel.cpp
index a0331f9..2b6b20d 100644 (file)
--- a/src/MsgRecipientPanel.cpp
+++ b/src/MsgRecipientPanel.cpp
@@ -63,6 +63,7 @@ RecipientPanel::RecipientPanel(void)
        , __isWindowDeactivated(false)
        , __isResponseReceived(false)
        , __pRecipientList(null)
+       , __isPopupExist(false)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
@@ -513,6 +514,7 @@ RecipientPanel::OnActionPerformed(const Control& source, int actionId)
                        MessagesApp* pMsgApp = (MessagesApp*) UiApp::GetInstance();
                        pMsgApp->SetRecipientPopupVisible(false);
 
+                       __isPopupExist = false;
                        SetFormEnabled(true);
                        __pExpandEditArea->SetKeypadEnabled(true);
                        RequestId rqId = REQUEST_DESTROY_MESSAGE_POPUP;
@@ -1094,6 +1096,7 @@ RecipientPanel::OnKeyReleased(Tizen::Ui::Control& source, const Tizen::Ui::KeyEv
                        MessagesApp* pMsgApp = (MessagesApp*) UiApp::GetInstance();
                        pMsgApp->SetRecipientPopupVisible(false);
 
+                       __isPopupExist = false;
                        SetFormEnabled(true);
                        __pExpandEditArea->SetKeypadEnabled(true);
                        __pErrorMessagePopup->SetShowState(false);
@@ -1214,6 +1217,7 @@ RecipientPanel::ShowMessage(const String& message)
        pOkDelete->AddActionEventListener(*this);
        ShowRecipientCount();
 
+       __isPopupExist = true;
        if(false == __isWindowDeactivated)
        {
                __pErrorMessagePopup->Show();
@@ -1238,10 +1242,11 @@ RecipientPanel::OnWindowActivated(const Window& source)
 
        __isWindowDeactivated = false;
 
-       if(__pErrorMessagePopup)
+       if(true == __isPopupExist)
        {
                if(false == __pErrorMessagePopup->GetShowState())
                {
+                       SetFormEnabled(false);
                        __pErrorMessagePopup->SetShowState(true);
                        __pErrorMessagePopup->Show();
                }