RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 13:28:11 +00:00
Code Issues Activity Actions

LibGUI: Add SortingProxyModel::sort_role()

Browse source 
This allows you to specify a role to sort by. Defaults to Role::Sort.
Also reordered the Role enum so that Role::Custom is last.
This commit is contained in:
Andreas Kling 2020-07-04 18:40:21 +02:00
parent d851863704
commit a5799ed462
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibGUI/Model.h
View file

@ -54,13 +54,13 @@ public:
enum class Role {
Display,
Sort,
Custom,
ForegroundColor,
BackgroundColor,
Icon,
Font,
DragData,
TextAlignment,
Custom = 0x100, // Applications are free to use roles above this number as they please
};
virtual ~Model();

4
Libraries/LibGUI/SortingProxyModel.cpp
View file

@ -112,8 +112,8 @@ void SortingProxyModel::resort()
return;
}
quick_sort(m_row_mappings, [&](auto row1, auto row2) -> bool {
auto data1 = target().data(target().index(row1, m_key_column), Model::Role::Sort);
auto data2 = target().data(target().index(row2, m_key_column), Model::Role::Sort);
auto data1 = target().data(target().index(row1, m_key_column), m_sort_role);
auto data2 = target().data(target().index(row2, m_key_column), m_sort_role);
if (data1 == data2)
return 0;
bool is_less_than;

4
Libraries/LibGUI/SortingProxyModel.h
View file

@ -49,6 +49,9 @@ public:
ModelIndex map_to_target(const ModelIndex&) const;
Role sort_role() const { return m_sort_role; }
void set_sort_role(Role role) { m_sort_role = role; }
private:
explicit SortingProxyModel(NonnullRefPtr<Model>&&);
@ -64,6 +67,7 @@ private:
Vector<int> m_row_mappings;
int m_key_column { -1 };
SortOrder m_sort_order { SortOrder::Ascending };
Role m_sort_role { Role::Sort };
bool m_sorting_case_sensitive { false };
};