pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bit more intelligent of msg re-selection when sync ends.

Browse source
This commit is contained in:
Martin Rotter 2021-05-17 14:21:48 +02:00
parent 2aa9f7c255
commit 792f269b5f
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/librssguard/gui/messagepreviewer.cpp
View file

@ -46,7 +46,7 @@ void MessagePreviewer::createConnections() {
} }
MessagePreviewer::MessagePreviewer(bool should_resize_to_fit, QWidget* parent) 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*>>()) { m_separator(nullptr), m_btnLabels(QList<QPair<LabelButton*, QAction*>>()) {
#if defined(USE_WEBENGINE) #if defined(USE_WEBENGINE)
m_txtMessage = new WebBrowser(this); m_txtMessage = new WebBrowser(this);
@ -102,7 +102,6 @@ void MessagePreviewer::clear() {
m_txtMessage->clear(); m_txtMessage->clear();
hide(); hide();
m_verticalScrollBarPosition = 0.0;
m_root.clear(); m_root.clear();
m_message = Message(); m_message = Message();
} }
@ -114,13 +113,6 @@ void MessagePreviewer::hideToolbar() {
void MessagePreviewer::loadMessage(const Message& message, RootItem* root) { void MessagePreviewer::loadMessage(const Message& message, RootItem* root) {
bool same_message = message.m_id == m_message.m_id && m_root == 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_message = message;
m_root = root; m_root = root;
@ -129,10 +121,10 @@ void MessagePreviewer::loadMessage(const Message& message, RootItem* root) {
updateLabels(false); updateLabels(false);
show(); show();
m_actionSwitchImportance->setChecked(m_message.m_isImportant); m_actionSwitchImportance->setChecked(m_message.m_isImportant);
m_txtMessage->loadMessage(message, m_root);
if (same_message) { if (!same_message) {
m_txtMessage->setVerticalScrollBarPosition(m_verticalScrollBarPosition); m_txtMessage->setVerticalScrollBarPosition(0.0);
m_txtMessage->loadMessage(message, m_root);
} }
} }
} }

1
src/librssguard/gui/messagepreviewer.h
View file

@ -78,7 +78,6 @@ class MessagePreviewer : public QWidget {
MessageBrowser* m_txtMessage; MessageBrowser* m_txtMessage;
#endif #endif
double m_verticalScrollBarPosition;
Message m_message; Message m_message;
QPointer<RootItem> m_root; QPointer<RootItem> m_root;
QAction* m_actionMarkRead; QAction* m_actionMarkRead;