diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2009-12-17 23:55:02 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-12-17 23:55:02 +0000 |
commit | 355799ce0bbb078237dfc1ae9874bbc5342acbc4 (patch) | |
tree | 7ca980c01c0d4d1d55a3b7b15418c95c5618afae /render/layout.c | |
parent | 4346b2b62b940182575e6612e46234355afa083c (diff) | |
download | netsurf-355799ce0bbb078237dfc1ae9874bbc5342acbc4.tar.gz netsurf-355799ce0bbb078237dfc1ae9874bbc5342acbc4.tar.bz2 |
Merge branches/MarkieB/gtkmain to trunk.
svn path=/trunk/netsurf/; revision=9729
Diffstat (limited to 'render/layout.c')
-rw-r--r-- | render/layout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/render/layout.c b/render/layout.c index c83753195..3463210bc 100644 --- a/render/layout.c +++ b/render/layout.c @@ -4435,7 +4435,7 @@ void layout_calculate_descendant_bboxes(struct box *box) { struct box *child; - if (box->width == UNKNOWN_WIDTH || box->height == AUTO /*|| + if ((box->width == UNKNOWN_WIDTH) || (box->height == AUTO) /*|| box->width < 0 || box->height < 0*/) { LOG(("%p has bad width or height", box)); /*while (box->parent) |