From 74161035bf9726f844bc50b0b9cf8f1ff6df3aba Mon Sep 17 00:00:00 2001 From: Denis Dolzhenko Date: Thu, 27 Oct 2016 16:13:26 +0300 Subject: [PATCH] Fixed: Navigation to bottom in conv. list. Change-Id: Ia99b473dc747b334ae8579b680aed88dd4d4d028 Signed-off-by: Denis Dolzhenko --- src/Conversation/Main/Controller/inc/Conversation.h | 2 +- src/Conversation/Main/Controller/src/Conversation.cpp | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Conversation/Main/Controller/inc/Conversation.h b/src/Conversation/Main/Controller/inc/Conversation.h index fda74378..fb4fa67c 100644 --- 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 6289dee5..d45e30e3 100644 --- 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() -- 2.34.1