From 9b64f2f13a0e5bcf48cd628454df8ee480dd1f3d Mon Sep 17 00:00:00 2001 From: Dmytro Dragan Date: Fri, 30 Sep 2016 13:53:48 +0300 Subject: [PATCH] TizenRefApp-6766 Fixed close behavior of attach panel Change-Id: Idf56f8ecb560823035c0cbe026b360f118305343 Signed-off-by: Dmytro Dragan --- src/Conversation/AppControl/inc/AttachPanel.h | 1 + src/Conversation/AppControl/src/AttachPanel.cpp | 8 ++++++++ src/Conversation/Main/Controller/src/Conversation.cpp | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/src/Conversation/AppControl/inc/AttachPanel.h b/src/Conversation/AppControl/inc/AttachPanel.h index 85db9658..e229e60f 100644 --- 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 cce94540..ed4a1f89 100644 --- 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 771407a0..ff6aa0b1 100644 --- 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); -- 2.34.1