lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-07-19 06:55:24 +02:00
Code Activity

smartlist: prevent selection oscillation

Browse source 
The dataChanged signal should be queued to prevent the conversation selection callback from re-entering SelectableListProxyModel::updateSelection prior to sort/filter updates. This can cause desync of the source and filter indices.

Change-Id: I35b3b38512cf51b1dd7ca8110b143a9223740056
This commit is contained in:
Andreas Traczyk 2023-12-04 13:51:27 -05:00
parent 4ca37a6293
commit 58a53e70d1
2 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/conversationlistmodel.cpp
View file

@ -58,7 +58,7 @@ ConversationListModel::ConversationListModel(LRCInstance* instance, QObject* par
connect(model_, &ConversationModel::dataChanged, this, [this](int position) {
const auto index = createIndex(position, 0);
Q_EMIT ConversationListModel::dataChanged(index, index);
});
}, Qt::QueuedConnection);
}
int

42
src/app/selectablelistproxymodel.cpp
View file

@ -33,26 +33,15 @@ SelectableListProxyModel::bindSourceModel(QAbstractListModel* model)
if (!model) {
return;
}
connect(sourceModel(),
&QAbstractListModel::dataChanged,
this,
&SelectableListProxyModel::onModelUpdated,
Qt::UniqueConnection);
connect(model,
&QAbstractListModel::rowsInserted,
this,
&SelectableListProxyModel::onModelUpdated,
Qt::UniqueConnection);
connect(model,
&QAbstractListModel::rowsRemoved,
this,
&SelectableListProxyModel::onModelTrimmed,
Qt::UniqueConnection);
connect(sourceModel(),
&QAbstractListModel::modelReset,
this,
&SelectableListProxyModel::deselect,
Qt::UniqueConnection);
auto connectModelSignal = [this, model](auto signal, auto slot) {
connect(model, signal, this, slot, Qt::UniqueConnection);
};
connectModelSignal(&QAbstractListModel::dataChanged, &SelectableListProxyModel::onModelUpdated);
connectModelSignal(&QAbstractListModel::rowsInserted, &SelectableListProxyModel::onModelUpdated);
connectModelSignal(&QAbstractListModel::rowsRemoved, &SelectableListProxyModel::onModelTrimmed);
connectModelSignal(&QAbstractListModel::modelReset, &SelectableListProxyModel::deselect);
}
void
@ -120,11 +109,14 @@ SelectableListProxyModel::updateSelection(bool rowsRemoved)
// if the source and filtered index is no longer valid
// this would indicate that a mutation has occured,
// thus any arbritrary ux decision is okay here
// In this case, we need to update the selection to one
// row above the current one.
if (!selectedSourceIndex_.isValid()) {
auto row = qMax(--currentFilteredRow_, 0);
auto row = qMax(currentFilteredRow_ - 1, 0);
selectedSourceIndex_ = mapToSource(index(row, 0));
filteredIndex = mapFromSource(selectedSourceIndex_);
// filteredIndex is not necessarily valid here, so we emit
// forcefully to ensure that the selection is updated
currentFilteredRow_ = filteredIndex.row();
Q_EMIT currentFilteredRowChanged();
Q_EMIT validSelectionChanged();
@ -139,9 +131,11 @@ SelectableListProxyModel::updateSelection(bool rowsRemoved)
// want to force reselection of other ui components, as the
// source index is still valid, in that case, or if the
// row hasn't changed, don't notify
if (filteredIndex.isValid() && lastFilteredRow != currentFilteredRow_) {
Q_EMIT validSelectionChanged();
if (!filteredIndex.isValid() || lastFilteredRow == currentFilteredRow_) {
return;
}
Q_EMIT validSelectionChanged();
}
void