From 3662d2aec7843a6e6ff155ee1522d42c1cffdd52 Mon Sep 17 00:00:00 2001
From: James Bursa <james@netsurf-browser.org>
Date: Wed, 21 Apr 2004 22:27:49 +0000
Subject: [project @ 2004-04-21 22:27:49 by bursa] Position floats correctly
 horizontally when padding or margins are present.

svn path=/import/netsurf/; revision=799
---
 render/layout.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'render')

diff --git a/render/layout.c b/render/layout.c
index 8fe86c03f..47c09ed20 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -54,7 +54,7 @@ static struct box * layout_line(struct box *first, int width, int *y,
 		int cx, int cy, struct box *cont, bool indent);
 static int layout_text_indent(struct css_style *style, int width);
 static void layout_float(struct box *b, int width);
-static void place_float_below(struct box *c, int width, int y,
+static void place_float_below(struct box *c, int width, int cx, int y,
 		struct box *cont);
 static void layout_table(struct box *box, int available_width);
 static void calculate_widths(struct box *box);
@@ -590,6 +590,7 @@ int line_height(struct css_style *style)
  * \param  first   box at start of line
  * \param  width   available width
  * \param  y       coordinate of top of line, updated on exit to bottom
+ * \param  cx      coordinate of left of line relative to cont
  * \param  cy      coordinate of top of line relative to cont
  * \param  cont    ancestor box which defines horizontal space, for floats
  * \param  indent  apply any first-line indent
@@ -750,11 +751,11 @@ struct box * layout_line(struct box *first, int width, int *y,
 			if (b->width < (x1 - x0) - x || (left == 0 && right == 0 && x == 0)) {
 				/* fits next to this line, or this line is empty with no floats */
 				if (b->type == BOX_FLOAT_LEFT) {
-					b->x = x0;
+					b->x = cx + x0;
 					x0 += b->width;
 					left = b;
 				} else {
-					b->x = x1 - b->width;
+					b->x = cx + x1 - b->width;
 					x1 -= b->width;
 					right = b;
 				}
@@ -763,7 +764,7 @@ struct box * layout_line(struct box *first, int width, int *y,
 /* 						b->x, b->y, x0, x1); */
 			} else {
 				/* doesn't fit: place below */
-				place_float_below(b, width, cy + height + 1, cont);
+				place_float_below(b, width, cx, cy + height + 1, cont);
 /* 				fprintf(stderr, "layout_line:     float doesn't fit %li %li\n", b->x, b->y); */
 			}
 			assert(cont->float_children != b);
@@ -946,11 +947,12 @@ void layout_float(struct box *b, int width)
  *
  * \param  c      float box to position
  * \param  width  available width
+ * \param  cx     x coordinate relative to cont to place float right of
  * \param  y      y coordinate relative to cont to place float below
  * \param  cont   ancestor box which defines horizontal space, for floats
  */
 
-void place_float_below(struct box *c, int width, int y,
+void place_float_below(struct box *c, int width, int cx, int y,
 		struct box *cont)
 {
 	int x0, x1, yy = y;
@@ -958,8 +960,8 @@ void place_float_below(struct box *c, int width, int y,
 	struct box * right;
 	do {
 		y = yy;
-		x0 = 0;
-		x1 = width;
+		x0 = cx;
+		x1 = cx + width;
 		find_sides(cont->float_children, y, y, &x0, &x1, &left, &right);
 		if (left != 0 && right != 0) {
 			yy = (left->y + left->height < right->y + right->height ?
-- 
cgit v1.2.3