TSAM-2190 Recipient still be focussed on after tapping on Back key

Change-Id: I15c2fca57f23ebdcc7a3863fef4a6a8daa76caea
Signed-off-by: Oleksander Kostenko <o.kostenko@samsung.com>

diff --git a/src/Conversation/Main/Controller/src/Conversation.cpp b/src/Conversation/Main/Controller/src/Conversation.cpp
index ff244fe..f1035fd 100644 (file)
--- a/src/Conversation/Main/Controller/src/Conversation.cpp
+++ b/src/Conversation/Main/Controller/src/Conversation.cpp
@@ -100,9 +100,17 @@ void Conversation::execCmd(const AppControlComposeRef &cmd)
 
     setThreadId(ThreadId());
     if(m_pRecipPanel)
+    {
         m_pRecipPanel->execCmd(cmd);
+        if(!isRecipExists())
+            m_pRecipPanel->setEntryFocus(true);
+    }
     if(m_pBody)
+    {
         m_pBody->execCmd(cmd);
+        if(isRecipExists())
+            m_pBody->setFocus(true);
+    }
 }
 
 void Conversation::execCmd(const AppControlDefaultRef &cmd)

diff --git a/src/Conversation/Recipients/Controller/src/ConvRecipientsPanel.cpp b/src/Conversation/Recipients/Controller/src/ConvRecipientsPanel.cpp
index 34456ee..cef7901 100644 (file)
--- a/src/Conversation/Recipients/Controller/src/ConvRecipientsPanel.cpp
+++ b/src/Conversation/Recipients/Controller/src/ConvRecipientsPanel.cpp
@@ -159,7 +159,6 @@ void ConvRecipientsPanel::execCmd(const AppControlComposeRef &cmd)
     {
         appendItem(recipStr);
     }
-    showMbe(!isMbeEmpty());
 }
 
 int ConvRecipientsPanel::getMaxRecipientCount() const

diff --git a/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp b/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp
index 81c2641..6f8fe94 100644 (file)
--- a/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp
+++ b/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp
@@ -167,6 +167,7 @@ void ConvRecipientsPanelView::create(Evas_Object *parent)
 Evas_Object *ConvRecipientsPanelView::createEntry(Evas_Object *parent)
 {
     m_pEntry = elm_entry_add(parent);
+    evas_object_show(m_pEntry);
     evas_object_size_hint_weight_set(m_pEntry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
     evas_object_size_hint_align_set(m_pEntry, EVAS_HINT_FILL, EVAS_HINT_FILL);
     elm_object_signal_emit(m_pEntry, "elm,action,hide,search_icon", "");
@@ -190,7 +191,6 @@ Evas_Object *ConvRecipientsPanelView::createEntry(Evas_Object *parent)
     evas_object_smart_callback_add(m_pEntry, "maxlength,reached", SMART_CALLBACK(ConvRecipientsPanelView, onEntryMaxlengthReached), this);
     evas_object_event_callback_add(m_pEntry, EVAS_CALLBACK_KEY_DOWN, EVAS_EVENT_CALLBACK(ConvRecipientsPanelView, onKeyDown), this);
     addGeometryChangedCb(m_pEntry);
-
     return m_pEntry;
 }