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

GTableView and friends: API improvements for 'Sortable' flag.

Browse source
This commit is contained in:
Ignas S 2019-08-12 11:46:01 +03:00 • committed by Andreas Kling
parent 405d7ddec8
commit 6228e18a09
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibGUI/GDirectoryModel.cpp
View file

@ -119,7 +119,7 @@ GModel::ColumnMetadata GDirectoryModel::column_metadata(int column) const
{ {
switch (column) { switch (column) {
case Column::Icon: case Column::Icon:
return { 16, TextAlignment::Center, false }; return { 16, TextAlignment::Center, nullptr, GModel::ColumnMetadata::Sortable::False };
case Column::Name: case Column::Name:
return { 120, TextAlignment::CenterLeft }; return { 120, TextAlignment::CenterLeft };
case Column::Size: case Column::Size:

3
Libraries/LibGUI/GModel.h
View file

@ -44,8 +44,9 @@ public:
struct ColumnMetadata { struct ColumnMetadata {
int preferred_width { 0 }; int preferred_width { 0 };
TextAlignment text_alignment { TextAlignment::CenterLeft }; TextAlignment text_alignment { TextAlignment::CenterLeft };
bool sortable { true };
const Font* font { nullptr }; const Font* font { nullptr };
enum class Sortable { False, True };
Sortable sortable { Sortable::True };
}; };
enum class Role { enum class Role {

2
Libraries/LibGUI/GTableView.cpp
View file

@ -159,7 +159,7 @@ void GTableView::mousedown_event(GMouseEvent& event)
} }
auto header_rect = this->header_rect(i); auto header_rect = this->header_rect(i);
auto column_metadata = model()->column_metadata(i); auto column_metadata = model()->column_metadata(i);
if (header_rect.contains(event.position()) && column_metadata.sortable) { if (header_rect.contains(event.position()) && column_metadata.sortable == GModel::ColumnMetadata::Sortable::True) {
auto new_sort_order = GSortOrder::Ascending; auto new_sort_order = GSortOrder::Ascending;
if (model()->key_column() == i) if (model()->key_column() == i)
new_sort_order = model()->sort_order() == GSortOrder::Ascending new_sort_order = model()->sort_order() == GSortOrder::Ascending