mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-03-09 16:51:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Extra logging to track the source of node size calculations

Browse Source 
A couple of minor changes to prevent unnecessary recalculation

svn path=/trunk/netsurf/; revision=12459
This commit is contained in:
Chris Young 2011-06-04 20:22:24 +00:00
parent a79ef8cffb
commit 24d0a07f8f
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
desktop/tree.c
View File

@ -42,6 +42,8 @@
#include "utils/utils.h" #include "utils/utils.h"
#include "utils/url.h" #include "utils/url.h"
#define TREE_NOISY_DEBUG 1
#define MAXIMUM_URL_LENGTH 1024 #define MAXIMUM_URL_LENGTH 1024
#define TREE_TEXT_SIZE_PT 11 #define TREE_TEXT_SIZE_PT 11
@ -473,8 +475,12 @@ static void tree_recalculate_node_sizes(struct tree *tree, struct node *node,
if (node->expanded) { if (node->expanded) {
for (element = &node->data; element != NULL; for (element = &node->data; element != NULL;
element = element->next) { element = element->next) {
if (recalculate_sizes) if (recalculate_sizes) {
#ifdef TREE_NOISY_DEBUG
if(element->text) LOG(("%s", element->text));
#endif
tree_recalculate_node_element(tree, element); tree_recalculate_node_element(tree, element);
}
node->box.width = (node->box.width > element->box.x + node->box.width = (node->box.width > element->box.x +
element->box.width - node->box.x) ? element->box.width - node->box.x) ?
node->box.width : node->box.width :
@ -485,10 +491,13 @@ static void tree_recalculate_node_sizes(struct tree *tree, struct node *node,
} else { } else {
if (recalculate_sizes) if (recalculate_sizes)
for (element = &node->data; element != NULL; for (element = &node->data; element != NULL;
element = element->next) element = element->next) {
#ifdef TREE_NOISY_DEBUG
if(element->text) LOG(("%s", element->text));
#endif
tree_recalculate_node_element(tree, element); tree_recalculate_node_element(tree, element);
else }
tree_recalculate_node_element(tree, &node->data);
node->box.width = node->data.box.width; node->box.width = node->data.box.width;
node->box.height = node->data.box.height; node->box.height = node->data.box.height;
} }
@ -823,6 +832,9 @@ static void tree_handle_node_element_changed(struct tree *tree,
width = element->box.width; width = element->box.width;
height = element->box.height; height = element->box.height;
#ifdef TREE_NOISY_DEBUG
if(element->text) LOG(("%s", element->text));
#endif
tree_recalculate_node_element(tree, element); tree_recalculate_node_element(tree, element);
if (element->box.height != height) { if (element->box.height != height) {
@ -1454,6 +1466,11 @@ void tree_update_node_element(struct tree *tree, struct node_element *element,
if (response != NODE_CALLBACK_HANDLED) if (response != NODE_CALLBACK_HANDLED)
free(element->bitmap); free(element->bitmap);
} }
else {
/* Increase the box width to accomodate the new icon */
element->box.width += NODE_INSTEP;
}
element->bitmap = bitmap; element->bitmap = bitmap;
} }