simplify sort column selection

Author: kryksyh

src/appshell/qml/MuseScore/AppShell/DevTools/Gallery/GeneralComponentsGallery.qml

@@ -1108,7 +1108,7 @@ Rectangle {
             valueTitle: "Age"
 
             model: ListModel {
-                 ListElement {
+                ListElement {
                     name: "Alex"
                     age: 12
                     valueType: "Int"
@@ -1174,9 +1174,8 @@ Rectangle {
                 return null
             }
 
-            sortOrderProvider: function(column) {
-                return tableProxy.columnSortOrder(column)
-            }
+            sortIndicatorColumn: tableProxy.sortIndicatorColumn
+            sortIndicatorOrder: tableProxy.sortIndicatorOrder
 
             onHorizontalHeaderClicked: function (column) {
                 tableProxy.toggleColumnSort(column)

src/framework/uicomponents/qml/Muse/UiComponents/StyledTableView.qml

@@ -34,7 +34,8 @@ Item {
     property alias model: tableView.model
     property var sourceComponentCallback
 
-    property var sortOrderProvider: null
+    property int sortIndicatorColumn: -1
+    property int sortIndicatorOrder: ColumnSortOrder.Unsorted
 
     property bool showVerticalHeader: false
     property bool horizontalHeaderNavigationEnabled: true
@@ -85,7 +86,6 @@ Item {
     QtObject {
         id: prv
 
-        property int sortRevision: 0
         // Set when sorting deactivates the header that the user had focused;
         // the new (or reused) delegate at navigationIndexForRestore picks
         // this up and re-activates itself, restoring the focus border.
@@ -99,8 +99,6 @@ Item {
         target: root.model
         ignoreUnknownSignals: true
         function onSortChanged() {
-            prv.sortRevision++
-
             // Sorting causes HorizontalHeaderView to rebuild its delegates.
             // The active NavigationControl is destroyed (or reused on a
             // different visual column), losing the focus border. Mark that
@@ -145,7 +143,7 @@ Item {
 
             headerCapitalization: root.headerCapitalization
 
-            sortOrder: root.sortOrderProvider ? (prv.sortRevision, root.sortOrderProvider(index)) : ColumnSortOrder.Unsorted
+            sortOrder: index === root.sortIndicatorColumn ? root.sortIndicatorOrder : ColumnSortOrder.Unsorted
 
             navigation.panel: root.navigationPanel
             navigation.row: 0

src/framework/uicomponents/qml/Muse/UiComponents/tablesortfilterproxymodel.cpp

@@ -53,6 +53,22 @@ QItemSelectionModel* TableSortFilterProxyModel::selectionModel() const
     return m_selectionModel;
 }
 
+int TableSortFilterProxyModel::sortIndicatorColumn() const
+{
+    if (m_sortPipeline.empty() || m_sortPipeline.back().column != m_sortIconColumn) {
+        return -1;
+    }
+    return m_sortIconColumn;
+}
+
+ColumnSortOrder::Type TableSortFilterProxyModel::sortIndicatorOrder() const
+{
+    if (m_sortPipeline.empty() || m_sortPipeline.back().column != m_sortIconColumn) {
+        return ColumnSortOrder::Type::Unsorted;
+    }
+    return m_sortPipeline.back().ascending ? ColumnSortOrder::Type::Ascending : ColumnSortOrder::Type::Descending;
+}
+
 void TableSortFilterProxyModel::setSourceModel(QAbstractItemModel* sourceModel)
 {
     QSortFilterProxyModel::setSourceModel(sourceModel);
@@ -113,20 +129,6 @@ int TableSortFilterProxyModel::mapRowToSource(int proxyRow) const
     return idx.isValid() ? idx.row() : -1;
 }
 
-ColumnSortOrder::Type TableSortFilterProxyModel::columnSortOrder(int column) const
-{
-    if (column != m_sortIconColumn) {
-        return ColumnSortOrder::Type::Unsorted;
-    }
-
-    const auto it = std::find_if(m_sortPipeline.begin(), m_sortPipeline.end(),
-                                 [column](const SortKey& k) { return k.column == column; });
-    if (it != m_sortPipeline.end() - 1) {
-        return ColumnSortOrder::Type::Unsorted;
-    }
-    return it->ascending ? ColumnSortOrder::Type::Ascending : ColumnSortOrder::Type::Descending;
-}
-
 void TableSortFilterProxyModel::reapplySort()
 {
     if (!sourceModel()) {

src/framework/uicomponents/qml/Muse/UiComponents/tablesortfilterproxymodel.h

@@ -57,19 +57,23 @@ class TableSortFilterProxyModel : public QSortFilterProxyModel
 
     Q_PROPERTY(QItemSelectionModel* selectionModel READ selectionModel CONSTANT)
     Q_PROPERTY(int rowCount READ rowCount NOTIFY rowCountChanged)
+    Q_PROPERTY(int sortIndicatorColumn READ sortIndicatorColumn NOTIFY sortChanged)
+    Q_PROPERTY(ColumnSortOrder::Type sortIndicatorOrder READ sortIndicatorOrder NOTIFY sortChanged)
 
 public:
     explicit TableSortFilterProxyModel(QObject* parent = nullptr);
 
     QItemSelectionModel* selectionModel() const;
 
+    int sortIndicatorColumn() const;
+    ColumnSortOrder::Type sortIndicatorOrder() const;
+
     void setSourceModel(QAbstractItemModel* sourceModel) override;
 
     Q_INVOKABLE void toggleColumnSort(int column);
     Q_INVOKABLE void clearSort();
     Q_INVOKABLE void invalidateFilters();
     Q_INVOKABLE int mapRowToSource(int proxyRow) const;
-    Q_INVOKABLE ColumnSortOrder::Type columnSortOrder(int column) const;
 
 signals:
     void rowCountChanged();