RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:07:35 +00:00
Code Issues Activity Actions

LibHTML: Add document icon in DOMTreeModel and keep document alive

Browse source
This commit is contained in:
Andreas Kling 2019-11-09 11:58:20 +01:00
parent 29b2117564
commit 7fcb21c935
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Libraries/LibHTML/DOMTreeModel.cpp
View file

@ -8,6 +8,7 @@
DOMTreeModel::DOMTreeModel(Document& document) DOMTreeModel::DOMTreeModel(Document& document)
: m_document(document) : m_document(document)
{ {
m_document_icon.set_bitmap_for_size(16, GraphicsBitmap::load_from_file("/res/icons/16x16/filetype-html.png"));
m_element_icon.set_bitmap_for_size(16, GraphicsBitmap::load_from_file("/res/icons/16x16/inspector-object.png")); m_element_icon.set_bitmap_for_size(16, GraphicsBitmap::load_from_file("/res/icons/16x16/inspector-object.png"));
m_text_icon.set_bitmap_for_size(16, GraphicsBitmap::load_from_file("/res/icons/16x16/filetype-unknown.png")); m_text_icon.set_bitmap_for_size(16, GraphicsBitmap::load_from_file("/res/icons/16x16/filetype-unknown.png"));
} }
@ -19,7 +20,7 @@ DOMTreeModel::~DOMTreeModel()
GModelIndex DOMTreeModel::index(int row, int column, const GModelIndex& parent) const GModelIndex DOMTreeModel::index(int row, int column, const GModelIndex& parent) const
{ {
if (!parent.is_valid()) { if (!parent.is_valid()) {
return create_index(row, column, &m_document); return create_index(row, column, m_document.ptr());
} }
auto& parent_node = *static_cast<Node*>(parent.internal_data()); auto& parent_node = *static_cast<Node*>(parent.internal_data());
return create_index(row, column, parent_node.child_at_index(row)); return create_index(row, column, parent_node.child_at_index(row));
@ -35,7 +36,7 @@ GModelIndex DOMTreeModel::parent_index(const GModelIndex& index) const
// No grandparent? Parent is the document! // No grandparent? Parent is the document!
if (!node.parent()->parent()) { if (!node.parent()->parent()) {
return create_index(0, 0, &m_document); return create_index(0, 0, m_document.ptr());
} }
// Walk the grandparent's children to find the index of node's parent in its parent. // Walk the grandparent's children to find the index of node's parent in its parent.
@ -89,6 +90,8 @@ GVariant DOMTreeModel::data(const GModelIndex& index, Role role) const
{ {
auto* node = static_cast<Node*>(index.internal_data()); auto* node = static_cast<Node*>(index.internal_data());
if (role == Role::Icon) { if (role == Role::Icon) {
if (node->is_document())
return m_document_icon;
if (node->is_element()) if (node->is_element())
return m_element_icon; return m_element_icon;
// FIXME: More node type icons? // FIXME: More node type icons?
@ -96,7 +99,6 @@ GVariant DOMTreeModel::data(const GModelIndex& index, Role role) const
} }
if (role == Role::Display) { if (role == Role::Display) {
if (node->is_text()) { if (node->is_text()) {
return String::format("%s", with_whitespace_collapsed(to<Text>(*node).data()).characters()); return String::format("%s", with_whitespace_collapsed(to<Text>(*node).data()).characters());
} }
return String::format("<%s>", node->tag_name().characters()); return String::format("<%s>", node->tag_name().characters());

3
Libraries/LibHTML/DOMTreeModel.h
View file

@ -23,8 +23,9 @@ public:
private: private:
explicit DOMTreeModel(Document&); explicit DOMTreeModel(Document&);
Document& m_document; NonnullRefPtr<Document> m_document;
GIcon m_document_icon;
GIcon m_element_icon; GIcon m_element_icon;
GIcon m_text_icon; GIcon m_text_icon;
}; };