RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 01:27:43 +00:00
Code Issues Activity Actions

LibGUI: Get rid of Model::ColumnMetadata and always use auto-sizing

Browse source 
Auto-sizing of view columns is now enabled by default. This removes the
last remaining need for ColumnMetadata, so this patch gets rid of it.
This commit is contained in:
Andreas Kling 2020-05-21 19:52:04 +02:00
parent c666c251c8
commit 2adb0a07e5
38 changed files with 1 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Applications/Browser/InspectorWidget.cpp
View file

@ -60,10 +60,7 @@ InspectorWidget::InspectorWidget()
auto& tab_widget = splitter.add<GUI::TabWidget>();
m_style_table_view = tab_widget.add_tab<GUI::TableView>("Styles");
m_style_table_view->set_size_columns_to_fit_content(true);
m_computed_style_table_view = tab_widget.add_tab<GUI::TableView>("Computed");
m_computed_style_table_view->set_size_columns_to_fit_content(true);
}
InspectorWidget::~InspectorWidget()

5
Applications/Calendar/AddEventDialog.cpp
View file

@ -146,11 +146,6 @@ String AddEventDialog::MonthListModel::column_name(int column) const
}
}
GUI::Model::ColumnMetadata AddEventDialog::MonthListModel::column_metadata([[maybe_unused]] int column) const
{
return {};
}
GUI::Variant AddEventDialog::MonthListModel::data(const GUI::ModelIndex& index, Role role) const
{
auto& month = Calendar::name_of_month(index.row() + 1);

1
Applications/Calendar/AddEventDialog.h
View file

@ -58,7 +58,6 @@ private:
virtual int row_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override;
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return Column::__Count; }
virtual String column_name(int) const override;
virtual ColumnMetadata column_metadata(int) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, Role = Role::Display) const override;
virtual void update() override;

5
Applications/DisplaySettings/ItemListModel.h
View file

@ -52,11 +52,6 @@ public:
return "Data";
}
virtual ColumnMetadata column_metadata(int) const override
{
return { 70 };
}
virtual GUI::Variant data(const GUI::ModelIndex& index, Role role = Role::Display) const override
{
if (role == Role::TextAlignment)

1
Applications/IRCClient/IRCAppWindow.cpp
View file

@ -333,7 +333,6 @@ void IRCAppWindow::setup_widgets()
m_window_list = horizontal_container.add<GUI::TableView>();
m_window_list->set_headers_visible(false);
m_window_list->set_alternating_row_colors(false);
m_window_list->set_size_columns_to_fit_content(true);
m_window_list->set_model(m_client->client_window_list_model());
m_window_list->set_activates_on_selection(true);
m_window_list->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);

9
Applications/IRCClient/IRCChannelMemberListModel.cpp
View file

@ -57,15 +57,6 @@ String IRCChannelMemberListModel::column_name(int column) const
ASSERT_NOT_REACHED();
}
GUI::Model::ColumnMetadata IRCChannelMemberListModel::column_metadata(int column) const
{
switch (column) {
case Column::Name:
return { 70 };
}
ASSERT_NOT_REACHED();
}
GUI::Variant IRCChannelMemberListModel::data(const GUI::ModelIndex& index, Role role) const
{
if (role == Role::TextAlignment)

1
Applications/IRCClient/IRCChannelMemberListModel.h
View file

@ -42,7 +42,6 @@ public:
virtual int row_count(const GUI::ModelIndex&) const override;
virtual int column_count(const GUI::ModelIndex&) const override;
virtual String column_name(int column) const override;
virtual ColumnMetadata column_metadata(int column) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, Role = Role::Display) const override;
virtual void update() override;
virtual String nick_at(const GUI::ModelIndex& index) const;

9
Applications/IRCClient/IRCWindowListModel.cpp
View file

@ -59,15 +59,6 @@ String IRCWindowListModel::column_name(int column) const
ASSERT_NOT_REACHED();
}
GUI::Model::ColumnMetadata IRCWindowListModel::column_metadata(int column) const
{
switch (column) {
case Column::Name:
return { 70 };
}
ASSERT_NOT_REACHED();
}
GUI::Variant IRCWindowListModel::data(const GUI::ModelIndex& index, Role role) const
{
if (role == Role::TextAlignment)

1
Applications/IRCClient/IRCWindowListModel.h
View file

@ -44,7 +44,6 @@ public:
virtual int row_count(const GUI::ModelIndex&) const override;
virtual int column_count(const GUI::ModelIndex&) const override;
virtual String column_name(int column) const override;
virtual ColumnMetadata column_metadata(int column) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, Role = Role::Display) const override;
virtual void update() override;

1
Applications/PixelPaint/main.cpp
View file

@ -89,7 +89,6 @@ int main(int argc, char** argv)
right_panel.set_layout<GUI::VerticalBoxLayout>();
auto& layer_table_view = right_panel.add<GUI::TableView>();
layer_table_view.set_size_columns_to_fit_content(true);
window->show();

18
Applications/SystemMonitor/DevicesModel.cpp
View file

@ -73,24 +73,6 @@ String DevicesModel::column_name(int column) const
}
}
GUI::Model::ColumnMetadata DevicesModel::column_metadata(int column) const
{
switch (column) {
case Column::Device:
return { 70 };
case Column::Major:
return { 32 };
case Column::Minor:
return { 32 };
case Column::ClassName:
return { 120 };
case Column::Type:
return { 120 };
default:
ASSERT_NOT_REACHED();
}
}
GUI::Variant DevicesModel::data(const GUI::ModelIndex& index, Role role) const
{
ASSERT(is_valid(index));

1
Applications/SystemMonitor/DevicesModel.h
View file

@ -47,7 +47,6 @@ public:
virtual int row_count(const GUI::ModelIndex&) const override;
virtual int column_count(const GUI::ModelIndex&) const override;
virtual String column_name(int column) const override;
virtual ColumnMetadata column_metadata(int column) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, Role = Role::Display) const override;
virtual void update() override;

2
Applications/SystemMonitor/NetworkStatisticsWidget.cpp
View file

@ -44,7 +44,6 @@ NetworkStatisticsWidget::NetworkStatisticsWidget()
adapters_group_box.set_preferred_size(0, 120);
m_adapter_table_view = adapters_group_box.add<GUI::TableView>();
m_adapter_table_view->set_size_columns_to_fit_content(true);
Vector<GUI::JsonArrayModel::FieldSpec> net_adapters_fields;
net_adapters_fields.empend("name", "Name", Gfx::TextAlignment::CenterLeft);
@ -64,7 +63,6 @@ NetworkStatisticsWidget::NetworkStatisticsWidget()
sockets_group_box.set_preferred_size(0, 0);
m_socket_table_view = sockets_group_box.add<GUI::TableView>();
m_socket_table_view->set_size_columns_to_fit_content(true);
Vector<GUI::JsonArrayModel::FieldSpec> net_tcp_fields;
net_tcp_fields.empend("peer_address", "Peer", Gfx::TextAlignment::CenterLeft);

1
Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp
View file

@ -34,7 +34,6 @@ ProcessFileDescriptorMapWidget::ProcessFileDescriptorMapWidget()
set_layout<GUI::VerticalBoxLayout>();
layout()->set_margins({ 4, 4, 4, 4 });
m_table_view = add<GUI::TableView>();
m_table_view->set_size_columns_to_fit_content(true);
Vector<GUI::JsonArrayModel::FieldSpec> pid_fds_fields;
pid_fds_fields.empend("fd", "FD", Gfx::TextAlignment::CenterRight);

1
Applications/SystemMonitor/ProcessMemoryMapWidget.cpp
View file

@ -69,7 +69,6 @@ ProcessMemoryMapWidget::ProcessMemoryMapWidget()
set_layout<GUI::VerticalBoxLayout>();
layout()->set_margins({ 4, 4, 4, 4 });
m_table_view = add<GUI::TableView>();
m_table_view->set_size_columns_to_fit_content(true);
Vector<GUI::JsonArrayModel::FieldSpec> pid_vm_fields;
pid_vm_fields.empend("Address", Gfx::TextAlignment::CenterLeft, [](auto& object) {
return String::format("%#x", object.get("address").to_u32());

62
Applications/SystemMonitor/ProcessModel.cpp
View file

@ -128,68 +128,6 @@ String ProcessModel::column_name(int column) const
}
}
GUI::Model::ColumnMetadata ProcessModel::column_metadata(int column) const
{
switch (column) {
case Column::Icon:
return { 16 };
case Column::PID:
return { 32 };
case Column::TID:
return { 32 };
case Column::State:
return { 75 };
case Column::Priority:
return { 16 };
case Column::EffectivePriority:
return { 16 };
case Column::User:
return { 50 };
case Column::Virtual:
return { 65 };
case Column::Physical:
return { 65 };
case Column::DirtyPrivate:
return { 65 };
case Column::CleanInode:
return { 65 };
case Column::PurgeableVolatile:
return { 65 };
case Column::PurgeableNonvolatile:
return { 65 };
case Column::CPU:
return { 32 };
case Column::Name:
return { 140 };
case Column::Syscalls:
return { 60 };
case Column::InodeFaults:
return { 60 };
case Column::ZeroFaults:
return { 60 };
case Column::CowFaults:
return { 60 };
case Column::FileReadBytes:
return { 60 };
case Column::FileWriteBytes:
return { 60 };
case Column::UnixSocketReadBytes:
return { 60 };
case Column::UnixSocketWriteBytes:
return { 60 };
case Column::IPv4SocketReadBytes:
return { 60 };
case Column::IPv4SocketWriteBytes:
return { 60 };
case Column::Pledge:
return { 60 };
case Column::Veil:
return { 60 };
default:
ASSERT_NOT_REACHED();
}
}
static String pretty_byte_size(size_t size)
{
return String::format("%uK", size / 1024);

1
Applications/SystemMonitor/ProcessModel.h
View file

@ -84,7 +84,6 @@ public:
virtual int row_count(const GUI::ModelIndex&) const override;
virtual int column_count(const GUI::ModelIndex&) const override;
virtual String column_name(int column) const override;
virtual ColumnMetadata column_metadata(int column) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, Role = Role::Display) const override;
virtual void update() override;

1
Applications/SystemMonitor/ProcessTableView.cpp
View file

@ -31,7 +31,6 @@
ProcessTableView::ProcessTableView()
{
set_size_columns_to_fit_content(true);
set_model(GUI::SortingProxyModel::create(ProcessModel::create()));
model()->set_key_column_and_sort_order(ProcessModel::Column::CPU, GUI::SortOrder::Descending);
refresh();

1
Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp
View file

@ -34,7 +34,6 @@ ProcessUnveiledPathsWidget::ProcessUnveiledPathsWidget()
set_layout<GUI::VerticalBoxLayout>();
layout()->set_margins({ 4, 4, 4, 4 });
m_table_view = add<GUI::TableView>();
m_table_view->set_size_columns_to_fit_content(true);
Vector<GUI::JsonArrayModel::FieldSpec> pid_unveil_fields;
pid_unveil_fields.empend("path", "Path", Gfx::TextAlignment::CenterLeft);

3
Applications/SystemMonitor/main.cpp
View file

@ -309,7 +309,6 @@ NonnullRefPtr<GUI::Widget> build_file_systems_tab()
self.set_layout<GUI::VerticalBoxLayout>();
self.layout()->set_margins({ 4, 4, 4, 4 });
auto& fs_table_view = self.add<GUI::TableView>();
fs_table_view.set_size_columns_to_fit_content(true);
Vector<GUI::JsonArrayModel::FieldSpec> df_fields;
df_fields.empend("mount_point", "Mount point", Gfx::TextAlignment::CenterLeft);
@ -402,7 +401,6 @@ NonnullRefPtr<GUI::Widget> build_pci_devices_tab()
self.set_layout<GUI::VerticalBoxLayout>();
self.layout()->set_margins({ 4, 4, 4, 4 });
auto& pci_table_view = self.add<GUI::TableView>();
pci_table_view.set_size_columns_to_fit_content(true);
auto db = PCIDB::Database::open();
@ -461,7 +459,6 @@ NonnullRefPtr<GUI::Widget> build_devices_tab()
self.layout()->set_margins({ 4, 4, 4, 4 });
auto& devices_table_view = self.add<GUI::TableView>();
devices_table_view.set_size_columns_to_fit_content(true);
devices_table_view.set_model(GUI::SortingProxyModel::create(DevicesModel::create()));
devices_table_view.model()->update();
};