TizenRefApp-6766 Fixed close behavior of attach panel

Change-Id: Idf56f8ecb560823035c0cbe026b360f118305343
Signed-off-by: Dmytro Dragan <dm.dragan@samsung.com>

diff --git a/src/Conversation/AppControl/inc/AttachPanel.h b/src/Conversation/AppControl/inc/AttachPanel.h
index 85db96586b717fcd0bdc6cba38541765b42a52a6..e229e60fb43b1787ce80425a8f5f733da4359ce2 100644 (file)
--- a/src/Conversation/AppControl/inc/AttachPanel.h
+++ b/src/Conversation/AppControl/inc/AttachPanel.h
@@ -40,6 +40,7 @@ namespace Msg
             void setListener(IAttachPanelListener *l);
             void show(bool value);
             bool isVisible() const;
+            bool isFullExpanded() const;
 
         private:
             AttachPanel(const AttachPanel&) = delete;

diff --git a/src/Conversation/AppControl/src/AttachPanel.cpp b/src/Conversation/AppControl/src/AttachPanel.cpp
index cce9454011c352ce4a31b55b5f0e2e9c937447f6..ed4a1f89cb349daa76ca8c80c3f9a542f0423056 100644 (file)
--- a/src/Conversation/AppControl/src/AttachPanel.cpp
+++ b/src/Conversation/AppControl/src/AttachPanel.cpp
@@ -72,6 +72,14 @@ bool AttachPanel::isVisible() const
     return res;
 }
 
+bool AttachPanel::isFullExpanded() const
+{
+    attach_panel_state_e res = ATTACH_PANEL_STATE_HIDDEN;
+    if(m_Handle)
+        attach_panel_get_state(m_Handle, &res);
+    return res == ATTACH_PANEL_STATE_FULL;
+}
+
 attach_panel_h AttachPanel::getAttachPanel()
 {
     if(m_Handle)

diff --git a/src/Conversation/Main/Controller/src/Conversation.cpp b/src/Conversation/Main/Controller/src/Conversation.cpp
index 771407a0f44ebbe8ce8f81f9381ae1236fd8a099..ff6aa0b11a1fe31e80405920129d5cebdb993bfd 100644 (file)
--- a/src/Conversation/Main/Controller/src/Conversation.cpp
+++ b/src/Conversation/Main/Controller/src/Conversation.cpp
@@ -1300,6 +1300,8 @@ void Conversation::onDeleteItemPressed(PopupListItem &item)
 {
     MSG_LOG("");
     item.getParent().destroy();
+    if (m_AttachPanel.isFullExpanded())
+        m_AttachPanel.show(false);
     m_pConvList->setMode(ConvList::SelectMode);
     updateNavibar();
 }
@@ -1308,6 +1310,8 @@ void Conversation::onAddRecipientsItemPressed(PopupListItem &item)
 {
     MSG_LOG("");
     item.getParent().destroy();
+    if (m_AttachPanel.isFullExpanded())
+        m_AttachPanel.show(false);
     createNewMsgThread();
     if(m_pRecipPanel)
         m_pRecipPanel->setEntryFocus(true);