From 65a412f9f11e2914c57a021d02608155b69c1844 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Mon, 12 Sep 2016 11:59:14 +0200
Subject: [PATCH 5/6] Hide accesskey when we switch message

---
 messageviewer/src/viewer/viewer_p.cpp                    | 4 ++++
 messageviewer/src/viewer/webengine/mailwebengineview.cpp | 5 +++++
 messageviewer/src/viewer/webengine/mailwebengineview.h   | 1 +
 3 files changed, 10 insertions(+)

diff --git a/messageviewer/src/viewer/viewer_p.cpp b/messageviewer/src/viewer/viewer_p.cpp
index f340acf..f55c12d 100644
--- a/messageviewer/src/viewer/viewer_p.cpp
+++ b/messageviewer/src/viewer/viewer_p.cpp
@@ -796,6 +796,9 @@ void ViewerPrivate::displaySplashPage(const QString &templateName, const QVarian
 
 void ViewerPrivate::enableMessageDisplay()
 {
+    if (mMsgDisplay) {
+        return;
+    }
     mMsgDisplay = true;
     adjustLayout();
 }
@@ -1255,6 +1258,7 @@ void ViewerPrivate::resetStateForNewMessage()
     mMimePartTree->clearModel();
 #endif
     mViewer->clearRelativePosition();
+    mViewer->hideAccessKeys();
     setShowSignatureDetails(false);
     mFindBar->closeBar();
     mViewerPluginToolManager->closeAllTools();
diff --git a/messageviewer/src/viewer/webengine/mailwebengineview.cpp b/messageviewer/src/viewer/webengine/mailwebengineview.cpp
index 7f5033d..c7ef0b5 100644
--- a/messageviewer/src/viewer/webengine/mailwebengineview.cpp
+++ b/messageviewer/src/viewer/webengine/mailwebengineview.cpp
@@ -233,6 +233,11 @@ void MailWebEngineView::showAccessKeys()
     d->mWebViewAccessKey->showAccessKeys();
 }
 
+void MailWebEngineView::hideAccessKeys()
+{
+    d->mWebViewAccessKey->hideAccessKeys();
+}
+
 bool MailWebEngineView::isScrolledToBottom() const
 {
     qDebug() << "bool MailWebEngineView::isScrolledToBottom() const not implemented";
diff --git a/messageviewer/src/viewer/webengine/mailwebengineview.h b/messageviewer/src/viewer/webengine/mailwebengineview.h
index 6571cf9..a0cfe4d 100644
--- a/messageviewer/src/viewer/webengine/mailwebengineview.h
+++ b/messageviewer/src/viewer/webengine/mailwebengineview.h
@@ -45,6 +45,7 @@ public:
 
     void saveMainFrameScreenshotInFile(const QString &filename);
     void showAccessKeys();
+    void hideAccessKeys();
     bool isScrolledToBottom() const;
 
     void setElementByIdVisible(const QString &id, bool visible);
-- 
2.7.4