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

Use TREE_LINE_HEIGHT define instead of magic 20 everywhere.

Browse Source 
svn path=/trunk/netsurf/; revision=11033
This commit is contained in:
Michael Drake 2010-12-12 12:45:12 +00:00
parent ff9bd6540c
commit 4c5a0d845c
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
desktop/tree.c
View File

@ -44,7 +44,7 @@
#define TREE_ICON_SIZE 16 #define TREE_ICON_SIZE 16
#define NODE_INSTEP 20 #define NODE_INSTEP 20
#define TREE_TEXT_HEIGHT 20 #define TREE_LINE_HEIGHT 20
#define FURNITURE_COLOUR 0x888888 #define FURNITURE_COLOUR 0x888888
static plot_font_style_t plot_fstyle = { static plot_font_style_t plot_fstyle = {
@ -221,7 +221,7 @@ static void tree_recalculate_node_element(struct tree *tree,
} }
element->box.width += 8; element->box.width += 8;
element->box.height = TREE_TEXT_HEIGHT; element->box.height = TREE_LINE_HEIGHT;
if (element->type == NODE_ELEMENT_TEXT_PLUS_ICON) if (element->type == NODE_ELEMENT_TEXT_PLUS_ICON)
element->box.width += NODE_INSTEP; element->box.width += NODE_INSTEP;
@ -341,7 +341,7 @@ static void tree_recalculate_node_positions(struct tree *tree,
} else { } else {
node->box.x = tree->flags & TREE_NO_FURNITURE node->box.x = tree->flags & TREE_NO_FURNITURE
? -NODE_INSTEP + 4 : 0; ? -NODE_INSTEP + 4 : 0;
node->box.y = -20; node->box.y = -TREE_LINE_HEIGHT;
} }
if (!node->expanded) { if (!node->expanded) {
@ -1477,7 +1477,7 @@ static void tree_draw_node_expansion(struct tree *tree, struct node *node,
if ((node->child != NULL) || (node->data.next != NULL)) { if ((node->child != NULL) || (node->data.next != NULL)) {
x = tree_x + node->box.x - (NODE_INSTEP / 2) - 4; x = tree_x + node->box.x - (NODE_INSTEP / 2) - 4;
y = tree_y + node->box.y - (TREE_TEXT_HEIGHT / 2) + 16; y = tree_y + node->box.y - (TREE_LINE_HEIGHT / 2) + 16;
plot.rectangle(x, y, x + 9, y + 9, plot_style_fill_white); plot.rectangle(x, y, x + 9, y + 9, plot_style_fill_white);
plot.rectangle(x , y, x + 8, y + 8, plot.rectangle(x , y, x + 8, y + 8,
plot_style_stroke_darkwbasec); plot_style_stroke_darkwbasec);
@ -1558,7 +1558,7 @@ static void tree_draw_node_element(struct tree *tree,
plot_style_fill_white); plot_style_fill_white);
} }
plot.text(x + 4, y + TREE_TEXT_HEIGHT * 0.75, plot.text(x + 4, y + TREE_LINE_HEIGHT * 0.75,
element->text, strlen(element->text), element->text, strlen(element->text),
fstyle); fstyle);
break; break;
@ -1618,7 +1618,7 @@ static void tree_draw_node(struct tree *tree, struct node *node,
if ((node->next != NULL) && if ((node->next != NULL) &&
(!(tree->flags & TREE_NO_FURNITURE))) { (!(tree->flags & TREE_NO_FURNITURE))) {
x0 = x1 = tree_x + node->box.x - (NODE_INSTEP / 2); x0 = x1 = tree_x + node->box.x - (NODE_INSTEP / 2);
y0 = tree_y + node->box.y + (20 / 2); y0 = tree_y + node->box.y + (TREE_LINE_HEIGHT / 2);
y1 = y0 + node->next->box.y - node->box.y; y1 = y0 + node->next->box.y - node->box.y;
plot.line(x0, y0, x1, y1, plot_style_stroke_darkwbasec); plot.line(x0, y0, x1, y1, plot_style_stroke_darkwbasec);
} }
@ -1632,7 +1632,7 @@ static void tree_draw_node(struct tree *tree, struct node *node,
(NODE_INSTEP / 2); (NODE_INSTEP / 2);
y0 = tree_y + node->data.box.y y0 = tree_y + node->data.box.y
+ node->data.box.height; + node->data.box.height;
y1 = y0 + (20 / 2); y1 = y0 + (TREE_LINE_HEIGHT / 2);
plot.line(x0, y0, x1, y1, plot.line(x0, y0, x1, y1,
plot_style_stroke_darkwbasec); plot_style_stroke_darkwbasec);
@ -1645,7 +1645,7 @@ static void tree_draw_node(struct tree *tree, struct node *node,
(NODE_INSTEP / 2); (NODE_INSTEP / 2);
y0 = tree_y + parent->data.box.y + y0 = tree_y + parent->data.box.y +
parent->data.box.height; parent->data.box.height;
y1 = y0 + (20 / 2); y1 = y0 + (TREE_LINE_HEIGHT / 2);
plot.line(x0, y0, x1, y1, plot.line(x0, y0, x1, y1,
plot_style_stroke_darkwbasec); plot_style_stroke_darkwbasec);
} }
@ -1653,7 +1653,7 @@ static void tree_draw_node(struct tree *tree, struct node *node,
x1 = x0 + (NODE_INSTEP / 2) - 2; x1 = x0 + (NODE_INSTEP / 2) - 2;
y0 = y1 = tree_y + node->data.box.y + y0 = y1 = tree_y + node->data.box.y +
node->data.box.height - node->data.box.height -
(20 / 2); (TREE_LINE_HEIGHT / 2);
plot.line(x0, y0, x1, y1, plot.line(x0, y0, x1, y1,
plot_style_stroke_darkwbasec); plot_style_stroke_darkwbasec);
tree_draw_node_expansion(tree, node, tree_draw_node_expansion(tree, node,
@ -1854,7 +1854,7 @@ static struct node_element *tree_get_node_element_at(struct node *node,
(node->data.box.x - NODE_INSTEP + 4 < x) (node->data.box.x - NODE_INSTEP + 4 < x)
&& (node->data.box.y + 4 < y) && && (node->data.box.y + 4 < y) &&
(node->data.box.x > x) && (node->data.box.x > x) &&
(node->data.box.y + 20 > y)) { (node->data.box.y + TREE_LINE_HEIGHT > y)) {
*furniture = true; *furniture = true;
return &node->data; return &node->data;
} }
@ -2033,8 +2033,6 @@ bool tree_mouse_action(struct tree *tree, browser_mouse_state mouse, int x,
if (tree->editing != NULL) if (tree->editing != NULL)
tree_stop_edit(tree, false); tree_stop_edit(tree, false);
/* no item either means cancel selection on (select) click or a drag */ /* no item either means cancel selection on (select) click or a drag */
if (element == NULL) { if (element == NULL) {
if (tree->flags & TREE_SINGLE_SELECT) { if (tree->flags & TREE_SINGLE_SELECT) {