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

Fixed #46.

Browse source
This commit is contained in:
Martin Rotter 2016-08-10 08:10:41 +02:00
parent 9e3448424b
commit ef7afcc839
3 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/binaries

@ -1 +1 @@
Subproject commit 75fe8e091b186711a5a7864f23ffea720a8832fe Subproject commit ecbdd80f5fd70a10c9f84206ec85c73ae10e08a1

4
resources/text/CHANGELOG
View file

@ -7,8 +7,12 @@ Added:
▪ Application settings now offers "Apply" button which saves settings without closing the dialog. (issue #16) ▪ Application settings now offers "Apply" button which saves settings without closing the dialog. (issue #16)
Fixed: Fixed:
▪ Correct message is now selected after some feed gets updated. (bug #46)
▪ RSS Guard correctly saves windows size/position when maximized on exit. (bug #45) ▪ RSS Guard correctly saves windows size/position when maximized on exit. (bug #45)
Changed:
▪ MariaDB binary DLL file updated to 10.1.16 (Windows only).
3.3.2 3.3.2
————— —————

26
src/gui/messagesview.cpp
View file

@ -70,18 +70,31 @@ void MessagesView::keyboardSearch(const QString &search) {
void MessagesView::reloadSelections(bool mark_current_index_read) { void MessagesView::reloadSelections(bool mark_current_index_read) {
const QDateTime dt1 = QDateTime::currentDateTime(); const QDateTime dt1 = QDateTime::currentDateTime();
const QModelIndex current_index = selectionModel()->currentIndex(); QModelIndex current_index = selectionModel()->currentIndex();
const QModelIndex mapped_current_index = m_proxyModel->mapToSource(current_index); const QModelIndex mapped_current_index = m_proxyModel->mapToSource(current_index);
const Message selected_message = m_sourceModel->messageAt(mapped_current_index.row()); const Message selected_message = m_sourceModel->messageAt(mapped_current_index.row());
const int col = qApp->settings()->value(GROUP(GUI), SETTING(GUI::DefaultSortColumnMessages)).toInt(); const int col = qApp->settings()->value(GROUP(GUI), SETTING(GUI::DefaultSortColumnMessages)).toInt();
const Qt::SortOrder ord = static_cast<Qt::SortOrder>(qApp->settings()->value(GROUP(GUI), SETTING(GUI::DefaultSortOrderMessages)).toInt()); const Qt::SortOrder ord = static_cast<Qt::SortOrder>(qApp->settings()->value(GROUP(GUI), SETTING(GUI::DefaultSortOrderMessages)).toInt());
// Reload the model now. // Reload the model now.
m_sourceModel->sort(col, ord); m_sourceModel->sort(col, ord);
selected_indexes = m_proxyModel->mapListFromSource(mapped_indexes, true); // Now, we must find the same previously focused message.
current_index = m_proxyModel->mapFromSource(m_sourceModel->index(mapped_current_index.row(), mapped_current_index.column())); if (selected_message.m_id > 0) {
for (int i = 0; i < m_proxyModel->rowCount(); i++) {
QModelIndex msg_idx = m_proxyModel->index(i, MSG_DB_TITLE_INDEX);
Message msg = m_sourceModel->messageAt(m_proxyModel->mapToSource(msg_idx).row());
if (msg.m_id == selected_message.m_id) {
current_index = msg_idx;
break;
}
if (i == m_proxyModel->rowCount() - 1) {
current_index = QModelIndex();
}
}
}
if (current_index.isValid()) { if (current_index.isValid()) {
if (!mark_current_index_read) { if (!mark_current_index_read) {
@ -90,9 +103,10 @@ void MessagesView::reloadSelections(bool mark_current_index_read) {
m_batchUnreadSwitch = true; m_batchUnreadSwitch = true;
} }
setCurrentIndex(current_index);
scrollTo(current_index); scrollTo(current_index);
reselectIndexes(selected_indexes); setCurrentIndex(current_index);
reselectIndexes(QModelIndexList() << current_index);
m_batchUnreadSwitch = false; m_batchUnreadSwitch = false;
} }
else { else {