From 792f269b5fd133159aa11bbe8c8193acf6010c82 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Mon, 17 May 2021 14:21:48 +0200
Subject: [PATCH] Bit more intelligent of msg re-selection when sync ends.

---
 src/librssguard/gui/messagepreviewer.cpp | 16 ++++------------
 src/librssguard/gui/messagepreviewer.h   |  1 -
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/librssguard/gui/messagepreviewer.cpp b/src/librssguard/gui/messagepreviewer.cpp
index 6d318f4d3..2eb7090ff 100755
--- a/src/librssguard/gui/messagepreviewer.cpp
+++ b/src/librssguard/gui/messagepreviewer.cpp
@@ -46,7 +46,7 @@ void MessagePreviewer::createConnections() {
 }
 
 MessagePreviewer::MessagePreviewer(bool should_resize_to_fit, QWidget* parent)
-  : QWidget(parent), m_layout(new QGridLayout(this)), m_toolBar(new QToolBar(this)), m_verticalScrollBarPosition(0.0),
+  : QWidget(parent), m_layout(new QGridLayout(this)), m_toolBar(new QToolBar(this)),
   m_separator(nullptr), m_btnLabels(QList<QPair<LabelButton*, QAction*>>()) {
 #if defined(USE_WEBENGINE)
   m_txtMessage = new WebBrowser(this);
@@ -102,7 +102,6 @@ void MessagePreviewer::clear() {
   m_txtMessage->clear();
   hide();
 
-  m_verticalScrollBarPosition = 0.0;
   m_root.clear();
   m_message = Message();
 }
@@ -114,13 +113,6 @@ void MessagePreviewer::hideToolbar() {
 void MessagePreviewer::loadMessage(const Message& message, RootItem* root) {
   bool same_message = message.m_id == m_message.m_id && m_root == root;
 
-  if (same_message) {
-    m_verticalScrollBarPosition = m_txtMessage->verticalScrollBarPosition();
-  }
-  else {
-    m_verticalScrollBarPosition = 0.0;
-  }
-
   m_message = message;
   m_root = root;
 
@@ -129,10 +121,10 @@ void MessagePreviewer::loadMessage(const Message& message, RootItem* root) {
     updateLabels(false);
     show();
     m_actionSwitchImportance->setChecked(m_message.m_isImportant);
-    m_txtMessage->loadMessage(message, m_root);
 
-    if (same_message) {
-      m_txtMessage->setVerticalScrollBarPosition(m_verticalScrollBarPosition);
+    if (!same_message) {
+      m_txtMessage->setVerticalScrollBarPosition(0.0);
+      m_txtMessage->loadMessage(message, m_root);
     }
   }
 }
diff --git a/src/librssguard/gui/messagepreviewer.h b/src/librssguard/gui/messagepreviewer.h
index c71c62ff3..3aea7db1c 100644
--- a/src/librssguard/gui/messagepreviewer.h
+++ b/src/librssguard/gui/messagepreviewer.h
@@ -78,7 +78,6 @@ class MessagePreviewer : public QWidget {
     MessageBrowser* m_txtMessage;
 #endif
 
-    double m_verticalScrollBarPosition;
     Message m_message;
     QPointer<RootItem> m_root;
     QAction* m_actionMarkRead;