From a14d7d6b7500e3f89684ad06dea6d8990e9b942d Mon Sep 17 00:00:00 2001
From: Denis Dolzhenko <d.dolzhenko@samsung.com>
Date: Wed, 23 Aug 2017 13:37:41 +0300
Subject: [PATCH] TizenRefApp-9198 Fix set recipient focus in Conversation

Change-Id: If73e96ebb5a1d5844037e3f9b10a7f958e2de6da
Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>
---
 src/Conversation/Main/Controller/inc/Conversation.h | 4 ++--
 src/MsgThread/Controller/src/MsgThread.cpp          | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Conversation/Main/Controller/inc/Conversation.h b/src/Conversation/Main/Controller/inc/Conversation.h
index 8fb96be1..3c7e17e9 100644
--- a/src/Conversation/Main/Controller/inc/Conversation.h
+++ b/src/Conversation/Main/Controller/inc/Conversation.h
@@ -69,6 +69,8 @@ namespace Msg {
 			void setThreadId(ThreadId id, const char *searchWord = nullptr, bool updateConvList = true, bool updateRecipPanel = true);
 			void setListener(IConversationListener *listener);
 			void forwardMsg(MsgId id);
+			void setBodyFocus();
+			void setRecipEntryFocus();
 
 		private:
 			enum Mode {
@@ -176,9 +178,7 @@ namespace Msg {
 			void convertMsgTypeHandler();
 			void checkAndSetMsgType(bool force = false);
 			void navigateToSlideShow(MsgId id);
-			void setBodyFocus();
 			bool getSipVisibility() const; // SIP = Software input panel
-			void setRecipEntryFocus();
 			void resetMsgThread(bool updateConvList = true, bool updateRecipPanel = true);
 			void updateActiveNotifPolicy();
 			std::vector<MsgId> getMsgIdListForReadReport() const;
diff --git a/src/MsgThread/Controller/src/MsgThread.cpp b/src/MsgThread/Controller/src/MsgThread.cpp
index 56d67674..000812bc 100644
--- a/src/MsgThread/Controller/src/MsgThread.cpp
+++ b/src/MsgThread/Controller/src/MsgThread.cpp
@@ -115,6 +115,7 @@ void MsgThread::composeNewMessage()
 	Conversation *frame = new Conversation(getParent());
 	getParent().push(*frame);
 	frame->setThreadId(ThreadId());
+	frame->setRecipEntryFocus();
 }
 
 void MsgThread::navigateToSettings()
-- 
2.34.1