diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2013-05-31 19:59:58 +0100 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2013-05-31 19:59:58 +0100 |
commit | 864762cbe60d04ba978ddbd9bf125240dd26f631 (patch) | |
tree | a085bc0b97366812442234c22679e241fbe3c70c /desktop | |
parent | 9b39408dffe09940589c2f00026c0e605d836b78 (diff) | |
parent | fe2a80fe109e0e8dc60957ded5a93b39f429e1f1 (diff) | |
download | netsurf-864762cbe60d04ba978ddbd9bf125240dd26f631.tar.gz netsurf-864762cbe60d04ba978ddbd9bf125240dd26f631.tar.bz2 |
Merge branch 'chris/gadtools-53-5'
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/tree.c | 11 | ||||
-rw-r--r-- | desktop/tree.h | 1 | ||||
-rw-r--r-- | desktop/tree_url_node.c | 11 | ||||
-rw-r--r-- | desktop/tree_url_node.h | 1 |
4 files changed, 24 insertions, 0 deletions
diff --git a/desktop/tree.c b/desktop/tree.c index 25bd9488b..2e35b5bf8 100644 --- a/desktop/tree.c +++ b/desktop/tree.c @@ -1552,6 +1552,17 @@ const char *tree_node_element_get_text(struct node_element *element) /** + * Returns the node element's icon + * + * \return the node element's icon + */ +struct bitmap *tree_node_element_get_icon(struct node_element *element) +{ + return element->bitmap; +} + + +/** * Get the root node of a tree * * \param tree the tree to get the root of diff --git a/desktop/tree.h b/desktop/tree.h index 00ac99984..20ade30c0 100644 --- a/desktop/tree.h +++ b/desktop/tree.h @@ -200,6 +200,7 @@ void tree_update_node_element(struct tree *tree, struct node_element *element, const char *text, void *bitmap); bool tree_update_element_text(struct tree *tree, struct node_element *element, char *text); const char *tree_node_element_get_text(struct node_element *element); +struct bitmap *tree_node_element_get_icon(struct node_element *element); struct node *tree_get_root(struct tree *tree); bool tree_is_edited(struct tree *tree); tree_drag_type tree_drag_status(struct tree *tree); diff --git a/desktop/tree_url_node.c b/desktop/tree_url_node.c index 945893f18..8472fff24 100644 --- a/desktop/tree_url_node.c +++ b/desktop/tree_url_node.c @@ -339,6 +339,17 @@ const char *tree_url_node_get_url(struct node *node) return tree_node_element_get_text(element); } + +struct bitmap *tree_url_node_get_icon(struct node *node) +{ + struct node_element *element; + element = tree_node_find_element(node, TREE_ELEMENT_TITLE, NULL); + if (element == NULL) + return NULL; + return tree_node_element_get_icon(element); +} + + void tree_url_node_edit_title(struct tree *tree, struct node *node) { struct node_element *element; diff --git a/desktop/tree_url_node.h b/desktop/tree_url_node.h index 1f0231df1..bcbc19296 100644 --- a/desktop/tree_url_node.h +++ b/desktop/tree_url_node.h @@ -43,6 +43,7 @@ void tree_update_URL_node(struct tree *tree, struct node *node, nsurl *url, const struct url_data *data); const char *tree_url_node_get_title(struct node *node); const char *tree_url_node_get_url(struct node *node); +struct bitmap *tree_url_node_get_icon(struct node *node); void tree_url_node_edit_title(struct tree *tree, struct node *node); void tree_url_node_edit_url(struct tree *tree, struct node *node); |