From: Denis Dolzhenko Date: Tue, 18 Oct 2016 13:40:30 +0000 (+0300) Subject: Fast close of attach panel. X-Git-Tag: submit/tizen/20161018.151522^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F89%2F92789%2F1;p=profile%2Fmobile%2Fapps%2Fnative%2Fmessage.git Fast close of attach panel. Change-Id: I1912ca3aa6f459370e5ab362d2acae5455e350ab Signed-off-by: Denis Dolzhenko --- diff --git a/src/Conversation/AppControl/inc/AttachPanel.h b/src/Conversation/AppControl/inc/AttachPanel.h index 85db965..695ec30 100644 --- a/src/Conversation/AppControl/inc/AttachPanel.h +++ b/src/Conversation/AppControl/inc/AttachPanel.h @@ -39,6 +39,7 @@ namespace Msg void setListener(IAttachPanelListener *l); void show(bool value); + void reset(); bool isVisible() const; private: diff --git a/src/Conversation/AppControl/src/AttachPanel.cpp b/src/Conversation/AppControl/src/AttachPanel.cpp index c812b1f..52313f8 100644 --- a/src/Conversation/AppControl/src/AttachPanel.cpp +++ b/src/Conversation/AppControl/src/AttachPanel.cpp @@ -40,11 +40,7 @@ AttachPanel::AttachPanel(App &app) AttachPanel::~AttachPanel() { - if(m_Handle) - { - attach_panel_hide(m_Handle); - attach_panel_destroy(m_Handle); - } + reset(); } void AttachPanel::setListener(IAttachPanelListener *l) @@ -64,6 +60,16 @@ void AttachPanel::show(bool value) attach_panel_hide(m_Handle); } +void AttachPanel::reset() +{ + if(m_Handle) + { + attach_panel_hide(m_Handle); + attach_panel_destroy(m_Handle); + m_Handle = nullptr; + } +} + bool AttachPanel::isVisible() const { bool res = false; diff --git a/src/Conversation/Main/Controller/src/Conversation.cpp b/src/Conversation/Main/Controller/src/Conversation.cpp index b6cb08f..de3aa04 100644 --- a/src/Conversation/Main/Controller/src/Conversation.cpp +++ b/src/Conversation/Main/Controller/src/Conversation.cpp @@ -1176,7 +1176,7 @@ void Conversation::onHwBackButtonClicked() if(sendReadReportIfNeeded()) return; - m_AttachPanel.show(false); + m_AttachPanel.reset(); saveDraftMsg(); pop(); }