From 263d627daab2a3ff92ae5b50e5ea0b90a03ef36c Mon Sep 17 00:00:00 2001 From: James Bursa Date: Wed, 18 Sep 2002 19:36:28 +0000 Subject: [project @ 2002-09-18 19:36:28 by bursa] New table layout algorithm. svn path=/import/netsurf/; revision=37 --- render/box.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'render/box.h') diff --git a/render/box.h b/render/box.h index 17bfcef4d..30a281a31 100644 --- a/render/box.h +++ b/render/box.h @@ -1,10 +1,11 @@ /** - * $Id: box.h,v 1.8 2002/09/08 18:11:56 bursa Exp $ + * $Id: box.h,v 1.9 2002/09/18 19:36:28 bursa Exp $ */ #ifndef _NETSURF_RENDER_BOX_H_ #define _NETSURF_RENDER_BOX_H_ +#include #include "libxml/HTMLparser.h" #include "netsurf/render/css.h" @@ -19,23 +20,33 @@ typedef enum { BOX_FLOAT_LEFT, BOX_FLOAT_RIGHT } box_type; +struct column { + enum { COLUMN_WIDTH_UNKNOWN = 0, COLUMN_WIDTH_FIXED, + COLUMN_WIDTH_AUTO, COLUMN_WIDTH_PERCENT } type; + unsigned long min, max, width; +}; + struct box { box_type type; xmlNode * node; struct css_style * style; unsigned long x, y, width, height; + unsigned long min_width, max_width; const char * text; const char * href; unsigned int length; - unsigned int colspan; + unsigned int columns; struct box * next; struct box * children; struct box * last; struct box * parent; struct box * float_children; struct box * next_float; + struct column *col; }; +#define UNKNOWN_MAX_WIDTH ULONG_MAX + /** * interface */ -- cgit v1.2.3