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

LibGUI: Move GUI::Model::Role to GUI::ModelRole

Browse source 
This is preparation for using ModelRole in the ModelIndex API.
This commit is contained in:
Andreas Kling 2020-08-16 16:00:07 +02:00
parent f6d7204689
commit a1e381a0f8
66 changed files with 201 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Libraries/LibWeb/DOMTreeModel.cpp
View file

@ -115,10 +115,10 @@ static String with_whitespace_collapsed(const StringView& string)
return builder.to_string();
}
GUI::Variant DOMTreeModel::data(const GUI::ModelIndex& index, Role role) const
GUI::Variant DOMTreeModel::data(const GUI::ModelIndex& index, GUI::ModelRole role) const
{
auto& node = *static_cast<DOM::Node*>(index.internal_data());
if (role == Role::Icon) {
if (role == GUI::ModelRole::Icon) {
if (node.is_document())
return m_document_icon;
if (node.is_element())
@ -126,7 +126,7 @@ GUI::Variant DOMTreeModel::data(const GUI::ModelIndex& index, Role role) const
// FIXME: More node type icons?
return m_text_icon;
}
if (role == Role::Display) {
if (role == GUI::ModelRole::Display) {
if (node.is_text())
return String::format("%s", with_whitespace_collapsed(downcast<DOM::Text>(node).data()).characters());
if (!node.is_element())

2
Libraries/LibWeb/DOMTreeModel.h
View file

@ -42,7 +42,7 @@ public:
virtual int row_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override;
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, Role = Role::Display) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
virtual GUI::ModelIndex index(int row, int column, const GUI::ModelIndex& parent = GUI::ModelIndex()) const override;
virtual GUI::ModelIndex parent_index(const GUI::ModelIndex&) const override;
virtual void update() override;

6
Libraries/LibWeb/LayoutTreeModel.cpp
View file

@ -115,17 +115,17 @@ static String with_whitespace_collapsed(const StringView& string)
return builder.to_string();
}
GUI::Variant LayoutTreeModel::data(const GUI::ModelIndex& index, Role role) const
GUI::Variant LayoutTreeModel::data(const GUI::ModelIndex& index, GUI::ModelRole role) const
{
auto& node = *static_cast<LayoutNode*>(index.internal_data());
if (role == Role::Icon) {
if (role == GUI::ModelRole::Icon) {
if (node.is_root())
return m_document_icon;
if (node.is_text())
return m_text_icon;
return m_element_icon;
}
if (role == Role::Display) {
if (role == GUI::ModelRole::Display) {
if (node.is_text())
return String::format("LayoutText: %s", with_whitespace_collapsed(downcast<LayoutText>(node).text_for_rendering()).characters());
StringBuilder builder;

2
Libraries/LibWeb/LayoutTreeModel.h
View file

@ -42,7 +42,7 @@ public:
virtual int row_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override;
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, Role = Role::Display) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
virtual GUI::ModelIndex index(int row, int column, const GUI::ModelIndex& parent = GUI::ModelIndex()) const override;
virtual GUI::ModelIndex parent_index(const GUI::ModelIndex&) const override;
virtual void update() override;

4
Libraries/LibWeb/StylePropertiesModel.cpp
View file

@ -61,10 +61,10 @@ String StylePropertiesModel::column_name(int column_index) const
ASSERT_NOT_REACHED();
}
}
GUI::Variant StylePropertiesModel::data(const GUI::ModelIndex& index, Role role) const
GUI::Variant StylePropertiesModel::data(const GUI::ModelIndex& index, GUI::ModelRole role) const
{
auto& value = m_values[index.row()];
if (role == Role::Display) {
if (role == GUI::ModelRole::Display) {
if (index.column() == Column::PropertyName)
return value.name;
if (index.column() == Column::PropertyValue)

2
Libraries/LibWeb/StylePropertiesModel.h
View file

@ -46,7 +46,7 @@ public:
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 GUI::Variant data(const GUI::ModelIndex&, Role = Role::Display) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
virtual void update() override;
private: