Merge bitcoin-core/gui#375: Emit dataChanged signal to dynamically re-sort Peers table

986bf78d7e8fd9b69841ecb0decaff840efe9cff qt: Emit dataChanged signal to dynamically re-sort Peers table (Hennadii Stepanov)

Pull request description:

  [By default](https://doc.qt.io/qt-5/qsortfilterproxymodel.html#details), the `PeerTableSortProxy`
  > dynamically re-sorts ... data whenever the original model changes.

  That is not the case on master (8cdf91735f2bdc55577d84a9915f5920ce23b00a) as in ecbd91153875c8cdd5b92b840afc116f65e457fb (#164) no signals are emitted to notify about model changes.

  This PR uses a dedicated [`dataChanged`](https://doc.qt.io/qt-5/qabstractitemmodel.html#dataChanged) signal.

  Fixes #367.

  An alternative to #374.

ACKs for top commit:
  jarolrod:
    ACK 986bf78d7e8fd9b69841ecb0decaff840efe9cff

Tree-SHA512: dcb92c2f9a2c632880429e9528007db426d2ad938c64dfa1f1538c03e4b62620df52ad7daf33b582976c67b472ff76bc0dae707049f4bbbd4941232cee9ce3d4
This commit is contained in:
Hennadii Stepanov 2021-07-06 00:00:33 +03:00 committed by Konstantin Akimov
parent 7aeb0adeb9
commit f358f2bcdd
No known key found for this signature in database
GPG Key ID: 2176C4A5D01EA524
3 changed files with 5 additions and 5 deletions

View File

@ -182,5 +182,7 @@ void PeerTableModel::refresh()
m_peers_data.swap(new_peers_data); m_peers_data.swap(new_peers_data);
} }
Q_EMIT changed(); const auto top_left = index(0, 0);
const auto bottom_right = index(rowCount() - 1, columnCount() - 1);
Q_EMIT dataChanged(top_left, bottom_right);
} }

View File

@ -74,9 +74,6 @@ public:
public Q_SLOTS: public Q_SLOTS:
void refresh(); void refresh();
Q_SIGNALS:
void changed();
private: private:
//! Internal peer data structure. //! Internal peer data structure.
QList<CNodeCombinedStats> m_peers_data{}; QList<CNodeCombinedStats> m_peers_data{};

View File

@ -39,6 +39,7 @@
#endif #endif
#include <QAbstractButton> #include <QAbstractButton>
#include <QAbstractItemModel>
#include <QButtonGroup> #include <QButtonGroup>
#include <QDir> #include <QDir>
#include <QFont> #include <QFont>
@ -743,7 +744,7 @@ void RPCConsole::setClientModel(ClientModel *model, int bestblock_height, int64_
// peer table signal handling - update peer details when selecting new node // peer table signal handling - update peer details when selecting new node
connect(ui->peerWidget->selectionModel(), &QItemSelectionModel::selectionChanged, this, &RPCConsole::updateDetailWidget); connect(ui->peerWidget->selectionModel(), &QItemSelectionModel::selectionChanged, this, &RPCConsole::updateDetailWidget);
connect(model->getPeerTableModel(), &PeerTableModel::changed, this, &RPCConsole::updateDetailWidget); connect(model->getPeerTableModel(), &QAbstractItemModel::dataChanged, [this] { updateDetailWidget(); });
// set up ban table // set up ban table
ui->banlistWidget->setModel(model->getBanTableModel()); ui->banlistWidget->setModel(model->getBanTableModel());