From c154e7242dd43b0516aad69ce88f9c87007fafcf Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Wed, 29 Dec 2010 16:39:23 +0000 Subject: Fix empty tree rendering. svn path=/trunk/netsurf/; revision=11135 --- desktop/tree.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/desktop/tree.c b/desktop/tree.c index bc033c4a9..1683c7a3f 100644 --- a/desktop/tree.c +++ b/desktop/tree.c @@ -1854,20 +1854,21 @@ void tree_draw(struct tree *tree, int x, int y, &plot_style_fill_tree_background); /* don't draw empty trees or trees with redraw flag set to false */ - if (tree->root->child == NULL || !tree->redraw) - return; + if (tree->root->child != NULL && tree->redraw) { - /* Draw the tree */ - tree_draw_tree(tree, tree->root, x, y, clip); + /* Draw the tree */ + tree_draw_tree(tree, tree->root, x, y, clip); - if (tree->editing != NULL) { - x = x + tree->editing->box.x; - y = y + tree->editing->box.y; - if (tree->editing->type == NODE_ELEMENT_TEXT_PLUS_ICON) - x += NODE_INSTEP; - textarea_redraw(tree->textarea, x, y, - clip.x0, clip.y0, clip.x1, clip.y1); - } + /* Draw textarea, if present */ + if (tree->editing != NULL) { + x = x + tree->editing->box.x; + y = y + tree->editing->box.y; + if (tree->editing->type == NODE_ELEMENT_TEXT_PLUS_ICON) + x += NODE_INSTEP; + textarea_redraw(tree->textarea, x, y, + clip.x0, clip.y0, clip.x1, clip.y1); + } + } /* Rendering complete */ if (plot.option_knockout) -- cgit v1.2.3