dolphin-emu/dolphin
1
0
Fork 1
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-09 01:30:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13911 from Dentomologist/gamelist_gridview_sorting

Browse Source 
GameList: Use List View's sorting for Grid View
This commit is contained in:
Tilka
2025-08-30 02:56:18 +01:00
committed by GitHub
parent e0c72cd963 489fd643d3
commit 25be1cfe97
3 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DolphinQt/GameList/GameList.cpp
View File

@@ -122,12 +122,19 @@ GameList::GameList(QWidget* parent) : QStackedWidget(parent), m_model(this)
m_list_proxy->setSortRole(GameListModel::SORT_ROLE); m_list_proxy->setSortRole(GameListModel::SORT_ROLE);
m_list_proxy->setSourceModel(&m_model); m_list_proxy->setSourceModel(&m_model);
m_grid_proxy = new GridProxyModel(this); m_grid_proxy = new GridProxyModel(this);
m_grid_proxy->setSortCaseSensitivity(Qt::CaseInsensitive);
m_grid_proxy->setSortRole(GameListModel::SORT_ROLE);
m_grid_proxy->setSourceModel(&m_model); m_grid_proxy->setSourceModel(&m_model);
MakeListView(); MakeListView();
MakeGridView(); MakeGridView();
MakeEmptyView(); MakeEmptyView();
// Use List View's sorting for Grid View too.
m_grid_proxy->sort(m_list_proxy->sortColumn(), m_list_proxy->sortOrder());
connect(m_list->horizontalHeader(), &QHeaderView::sortIndicatorChanged, m_grid_proxy,
&GridProxyModel::sort);
if (Settings::GetQSettings().contains(QStringLiteral("gridview/scale"))) if (Settings::GetQSettings().contains(QStringLiteral("gridview/scale")))
m_model.SetScale(Settings::GetQSettings().value(QStringLiteral("gridview/scale")).toFloat()); m_model.SetScale(Settings::GetQSettings().value(QStringLiteral("gridview/scale")).toFloat());

24
Source/Core/DolphinQt/GameList/GridProxyModel.cpp
View File

@@ -18,8 +18,7 @@ const QSize LARGE_BANNER_SIZE(144, 48);
GridProxyModel::GridProxyModel(QObject* parent) : QSortFilterProxyModel(parent) GridProxyModel::GridProxyModel(QObject* parent) : QSortFilterProxyModel(parent)
{ {
setSortCaseSensitivity(Qt::CaseInsensitive); setDynamicSortFilter(true);
sort(static_cast<int>(GameListModel::Column::Title));
} }
QVariant GridProxyModel::data(const QModelIndex& i, int role) const QVariant GridProxyModel::data(const QModelIndex& i, int role) const
@@ -76,3 +75,24 @@ bool GridProxyModel::filterAcceptsRow(int source_row, const QModelIndex& source_
GameListModel* glm = qobject_cast<GameListModel*>(sourceModel()); GameListModel* glm = qobject_cast<GameListModel*>(sourceModel());
return glm->ShouldDisplayGameListItem(source_row); return glm->ShouldDisplayGameListItem(source_row);
} }
bool GridProxyModel::lessThan(const QModelIndex& left, const QModelIndex& right) const
{
if (left.data(GameListModel::SORT_ROLE) != right.data(GameListModel::SORT_ROLE))
return QSortFilterProxyModel::lessThan(left, right);
// If two items are otherwise equal, compare them by their title
const auto right_title = sourceModel()
->index(right.row(), static_cast<int>(GameListModel::Column::Title))
.data()
.toString();
const auto left_title = sourceModel()
->index(left.row(), static_cast<int>(GameListModel::Column::Title))
.data()
.toString();
if (sortOrder() == Qt::AscendingOrder)
return left_title < right_title;
return right_title < left_title;
}

3
Source/Core/DolphinQt/GameList/GridProxyModel.h
View File

@@ -14,5 +14,8 @@ class GridProxyModel final : public QSortFilterProxyModel
public: public:
explicit GridProxyModel(QObject* parent = nullptr); explicit GridProxyModel(QObject* parent = nullptr);
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
protected:
bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override; bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
bool lessThan(const QModelIndex& left, const QModelIndex& right) const override;
}; };