Fixed: Navigation to bottom in conv. list.

Change-Id: Ia99b473dc747b334ae8579b680aed88dd4d4d028
Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>

diff --git a/src/Conversation/Main/Controller/inc/Conversation.h b/src/Conversation/Main/Controller/inc/Conversation.h
index fda743788e3d5cac4a81843d00d4e13fb9e38211..fb4fa67c7d960fd53a5dac813ceaf2ec8649d411 100644 (file)
--- a/src/Conversation/Main/Controller/inc/Conversation.h
+++ b/src/Conversation/Main/Controller/inc/Conversation.h
@@ -176,7 +176,7 @@ namespace Msg
             void checkAndSetMsgType(bool force = false);
             void navigateToSlideShow(MsgId id);
             void setBodyFocus();
-            bool getBodyFocus() const;
+            bool getSipVisibility() const; // SIP = Software input panel
             void setRecipEntryFocus();
             void resetMsgThread(bool updateConvList = true, bool updateRecipPanel = true);
             void updateActiveNotifPolicy();

diff --git a/src/Conversation/Main/Controller/src/Conversation.cpp b/src/Conversation/Main/Controller/src/Conversation.cpp
index 6289dee5206b971c5999abb3dac013e849977ed5..d45e30e3b9ccb1785fb6c7e6e9ed0e149e6fd9d5 100644 (file)
--- a/src/Conversation/Main/Controller/src/Conversation.cpp
+++ b/src/Conversation/Main/Controller/src/Conversation.cpp
@@ -416,7 +416,7 @@ void Conversation::showConvList(bool show)
         if(!m_pConvList)
         {
             m_pConvList = new ConvList(*m_pLayout, getApp(), m_WorkingDir);
-            m_pConvList->setBodyFocusCb(std::bind(&Conversation::getBodyFocus, this));
+            m_pConvList->setBodyFocusCb(std::bind(&Conversation::getSipVisibility, this));
             m_pConvList->setListener(this);
             m_pConvList->show();
             m_pLayout->setConvList(*m_pConvList);
@@ -828,9 +828,12 @@ void Conversation::setBodyFocus()
     }
 }
 
-bool Conversation::getBodyFocus() const
+bool Conversation::getSipVisibility() const
 {
-    return m_pBody ? m_pBody->getFocus() : false;
+    bool res = m_pBody ? m_pBody->getFocus() : false;
+    if(!res)
+        res = m_AttachPanel.isVisible();
+    return res;
 }
 
 void Conversation::setRecipEntryFocus()