April 2008 - netsurf-commits - listmaster.pepperfish.net

r4110 jmb - /trunk/netsurf/gtk/gtk_filetype.c

by netsurf＠semichrome.net

Author: jmb Date: Mon Apr 28 06:08:35 2008 New Revision: 4110 URL: http://source.netsurf-browser.org?rev=4110&view=rev Log: Add html extensions to minimal MIME type hash Modified: trunk/netsurf/gtk/gtk_filetype.c Modified: trunk/netsurf/gtk/gtk_filetype.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_filetype.c?rev=41... ============================================================================== --- trunk/netsurf/gtk/gtk_filetype.c (original) +++ trunk/netsurf/gtk/gtk_filetype.c Mon Apr 28 06:08:35 2008 @@ -57,6 +57,8 @@ */ hash_add(mime_hash, "css", "text/css"); + hash_add(mime_hash, "htm", "text/html"); + hash_add(mime_hash, "html", "text/html"); hash_add(mime_hash, "jpg", "image/jpeg"); hash_add(mime_hash, "jpeg", "image/jpeg"); hash_add(mime_hash, "gif", "image/gif");

15 years, 7 months

1
0
0 / 0

r4109 jmb - /branches/mikeL/

by netsurf＠semichrome.net

Author: jmb Date: Sun Apr 27 15:41:58 2008 New Revision: 4109 URL: http://source.netsurf-browser.org?rev=4109&view=rev Log: Create branch for Mike L. Added: branches/mikeL/

15 years, 7 months

1
0
0 / 0

r4108 tlsa - /trunk/netsurf/render/layout.c

by netsurf＠semichrome.net

Author: tlsa Date: Fri Apr 25 09:57:36 2008 New Revision: 4108 URL: http://source.netsurf-browser.org?rev=4108&view=rev Log: Accomodate text area scrollbars in fixed widths. Fix radio button / checkbox issue. Modified: trunk/netsurf/render/layout.c Modified: trunk/netsurf/render/layout.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/layout.c?rev=4108&... ============================================================================== --- trunk/netsurf/render/layout.c (original) +++ trunk/netsurf/render/layout.c Fri Apr 25 09:57:36 2008 @@ -502,9 +502,9 @@ if (block->gadget && (block->gadget->type == GADGET_TEXTBOX || block->gadget->type == GADGET_PASSWORD || block->gadget->type == GADGET_FILE || - block->gadget->type == GADGET_TEXTAREA)) { - assert(block->style); - + block->gadget->type == GADGET_TEXTAREA) && + block->style && + block->style->width.width == CSS_WIDTH_AUTO) { min = max = css_len2px(&size, block->style); } @@ -826,6 +826,8 @@ if (width == AUTO) { size.value = 10; width = css_len2px(&size, box->style); + } else { + width -= scrollbar_width; } if (height == AUTO) { size.value = 4; @@ -1786,6 +1788,9 @@ float frac; size_t i, j; struct box *b; + struct css_length gadget_size; /* Checkbox / radio buttons */ + gadget_size.unit = CSS_UNIT_EM; + gadget_size.value = 1; /* corresponds to the pass 1 loop in layout_line() */ for (b = first; b; b = b->next) { @@ -1954,7 +1959,7 @@ } else { /* form control with no object */ if (width == AUTO) - width = 0; + width = css_len2px(&gadget_size, b->style); } if (min < width)

15 years, 7 months

1
0
0 / 0

r4107 tlsa - in /trunk/netsurf: !NetSurf/Resources/CSS, f79 render/layout.c

by netsurf＠semichrome.net

Author: tlsa Date: Fri Apr 25 09:15:18 2008 New Revision: 4107 URL: http://source.netsurf-browser.org?rev=4107&view=rev Log: Change handling of form element widths / heights. Modified: trunk/netsurf/!NetSurf/Resources/CSS,f79 trunk/netsurf/render/layout.c Modified: trunk/netsurf/!NetSurf/Resources/CSS,f79 URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/CSS%... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/CSS,f79 (original) +++ trunk/netsurf/!NetSurf/Resources/CSS,f79 Fri Apr 25 09:15:18 2008 @@ -145,18 +145,16 @@ form { display: block; } input, button { background-color: #fff; color: #000; text-align: left; - font-family: sans-serif; width: 10em; height: auto; overflow: hidden; + font-family: sans-serif; width: auto; height: auto; overflow: hidden; margin: 1px; border: 2px solid #333; padding: 1px 2px; } input[type=button], input[type=reset], input[type=submit], button { background-color: #d9d9d9; color: #000; text-align: center; - width: auto; height: auto; border: medium outset #d9d9d9; padding: 1px 0.5em; } input[type=image] { background-color: transparent; color: #000; - width: auto; height: auto; border: none; padding: 0 2px; } + border: none; padding: 0 2px; } input[type=checkbox], input[type=radio] { background-color: transparent; - width: 1em; height: 1em; border: none; padding: 0 0.1em; } -input[type=file] { background-color: #d9d9d9; color: #000; - width: 10em; height: 1.5em; font-style: italic; + border: none; padding: 0 0.1em; } +input[type=file] { background-color: #d9d9d9; color: #000; font-style: italic; border: medium inset #d9d9d9; padding: 1px 2px;} input[align=left] { float: left; } input[align=right] { float: right; } @@ -168,7 +166,7 @@ select:after { content: "\25bc"; border-left: 4px ridge #d9d9d9; } textarea { background-color: #fff; color: #000; text-align: left; - font-family: monospace; width: 10em; height: 4em; overflow: scroll; + font-family: monospace; width: auto; height: auto; overflow: scroll; margin: 1px; border: 2px solid #333; padding: 0 2px; } fieldset { display: block; border: thin solid #888; margin: 1.12em 0; } Modified: trunk/netsurf/render/layout.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/layout.c?rev=4107&... ============================================================================== --- trunk/netsurf/render/layout.c (original) +++ trunk/netsurf/render/layout.c Fri Apr 25 09:15:18 2008 @@ -487,6 +487,9 @@ int min = 0, max = 0; int extra_fixed = 0; float extra_frac = 0; + struct css_length size; + size.unit = CSS_UNIT_EM; + size.value = 10; assert(block->type == BOX_BLOCK || block->type == BOX_INLINE_BLOCK || @@ -495,6 +498,15 @@ /* check if the widths have already been calculated */ if (block->max_width != UNKNOWN_MAX_WIDTH) return; + + if (block->gadget && (block->gadget->type == GADGET_TEXTBOX || + block->gadget->type == GADGET_PASSWORD || + block->gadget->type == GADGET_FILE || + block->gadget->type == GADGET_TEXTAREA)) { + assert(block->style); + + min = max = css_len2px(&size, block->style); + } if (block->object) { if (block->object->type == CONTENT_HTML) { @@ -776,7 +788,8 @@ padding[BOTTOM] += scrollbar_width; if (box->object && box->object->type != CONTENT_HTML) { - /* floating replaced element, see 10.3.6 and 10.6.2 */ + /* Floating replaced element, with intrinsic width or height. + * See 10.3.6 and 10.6.2 */ if (width == AUTO && height == AUTO) { width = box->object->width; height = box->object->height; @@ -786,9 +799,43 @@ else if (height == AUTO) height = box->object->height * (float) width / box->object->width; + } else if (box->gadget && (box->gadget->type == GADGET_TEXTBOX || + box->gadget->type == GADGET_PASSWORD || + box->gadget->type == GADGET_FILE || + box->gadget->type == GADGET_TEXTAREA)) { + /* Give sensible dimensions to gadgets, with auto width/height, + * that don't shrink to fit contained text. */ + assert(box->style); + + struct css_length size; + size.unit = CSS_UNIT_EM; + if (box->gadget->type == GADGET_TEXTBOX || + box->gadget->type == GADGET_PASSWORD || + box->gadget->type == GADGET_FILE) { + if (width == AUTO) { + size.value = 10; + width = css_len2px(&size, box->style); + } + if (box->gadget->type == GADGET_FILE && + height == AUTO) { + size.value = 1.5; + height = css_len2px(&size, box->style); + } + } + if (box->gadget->type == GADGET_TEXTAREA) { + if (width == AUTO) { + size.value = 10; + width = css_len2px(&size, box->style); + } + if (height == AUTO) { + size.value = 4; + height = css_len2px(&size, box->style); + } + } } else if (width == AUTO) { /* CSS 2.1 section 10.3.5 */ - width = min(max(box->min_width, available_width), box->max_width); + width = min(max(box->min_width, available_width), + box->max_width); width -= box->margin[LEFT] + box->border[LEFT] + box->padding[LEFT] + box->padding[RIGHT] + box->border[RIGHT] + box->margin[RIGHT]; @@ -1145,6 +1192,9 @@ int space_before = 0, space_after = 0; unsigned int inline_count = 0; unsigned int i; + struct css_length gadget_size; /* Checkbox / radio buttons */ + gadget_size.unit = CSS_UNIT_EM; + gadget_size.value = 1; LOG(("first %p, first->text '%.*s', width %i, y %i, cx %i, cy %i", first, (int) first->length, first->text, *width, @@ -1167,7 +1217,8 @@ * this is the line-height if there are text children and also in the * case of an initially empty text input */ if (has_text_children || first->parent->parent->gadget) - used_height = height = line_height(first->parent->parent->style); + used_height = height = + line_height(first->parent->parent->style); else /* inline containers with no text are usually for layout and * look better with no minimum line-height */ @@ -1354,10 +1405,9 @@ } else { /* form control with no object */ if (b->width == AUTO) - b->width = 0; + b->width = css_len2px(&gadget_size, b->style); if (b->height == AUTO) - b->height = line_height(b->style ? b->style : - b->parent->parent->style); + b->height = css_len2px(&gadget_size, b->style); } if (b->object && b->object->type == CONTENT_HTML && @@ -1484,12 +1534,7 @@ x1 -= b->width; right = b; } - /* Heed any previous clear */ - if (cy < cont->clear_level) { - b->y = cont->clear_level; - } else { - b->y = cy; - } + b->y = cy; } else { /* cleared or doesn't fit */ /* place below into next available space */

15 years, 7 months

1
0
0 / 0

r4106 tlsa - in /trunk/netsurftest/works: containing-block.html floats-and-position.html

by netsurf＠semichrome.net

Author: tlsa Date: Wed Apr 23 14:42:02 2008 New Revision: 4106 URL: http://source.netsurf-browser.org?rev=4106&view=rev Log: More test cases. Tests for floats and absolute position interactions. Added: trunk/netsurftest/works/containing-block.html trunk/netsurftest/works/floats-and-position.html Added: trunk/netsurftest/works/containing-block.html URL: http://source.netsurf-browser.org/trunk/netsurftest/works/containing-bloc... ============================================================================== --- trunk/netsurftest/works/containing-block.html (added) +++ trunk/netsurftest/works/containing-block.html Wed Apr 23 14:42:02 2008 @@ -1,0 +1,18 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html> +<head> +<title>Containing block</title> +</head> + +<body> + +<div style="background:#ff0; width:15em; height:2em; margin:0 auto; position:relative;"> + <div style="float:left;"> + <div style="position:absolute; left:5em;">text</div> + </div> +</div> + +<p>Above, the yellow box is given relative positioning, so it should be the containing block for the absolutly positioned "text". So the text should be positioned inside the yellow box, 5em from the left edge. There is a float between the positioned text and the yellow containing block, which should not affect positioning.</p> + +</body> +</html> Added: trunk/netsurftest/works/floats-and-position.html URL: http://source.netsurf-browser.org/trunk/netsurftest/works/floats-and-posi... ============================================================================== --- trunk/netsurftest/works/floats-and-position.html (added) +++ trunk/netsurftest/works/floats-and-position.html Wed Apr 23 14:42:02 2008 @@ -1,0 +1,13 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html><head></head><body> + +<div style="width:10em; height:10em; background:red; position:relative;"> + +<div style="position:absolute;bottom:0;"> + <div style="float:left;"> + <div style="position:absolute;top:0;left:0; width:10em; height:10em; background:green;"></div> + + </div></div> + + +

15 years, 7 months

1
0
0 / 0

r4105 tlsa - in /trunk/netsurftest: haveproblems/ works/

by netsurf＠semichrome.net

Author: tlsa Date: Wed Apr 23 14:30:03 2008 New Revision: 4105 URL: http://source.netsurf-browser.org?rev=4105&view=rev Log: Add many new test cases. Move a test case from haveproblems/ to works/. Added: trunk/netsurftest/haveproblems/inline-background.html trunk/netsurftest/works/float-clear.html trunk/netsurftest/works/float-clear2.html trunk/netsurftest/works/float-clear3.html trunk/netsurftest/works/float-clear4.html trunk/netsurftest/works/float-clear5.html trunk/netsurftest/works/float-clear6.html trunk/netsurftest/works/float-clear7.html trunk/netsurftest/works/float-clearing.html - copied unchanged from r4080, trunk/netsurftest/haveproblems/float-clearing.html trunk/netsurftest/works/minmax-height-1.html trunk/netsurftest/works/minmax-height-2.html trunk/netsurftest/works/minmax-height-3.html trunk/netsurftest/works/minmax-height-4.html trunk/netsurftest/works/minmax-height-5.html Removed: trunk/netsurftest/haveproblems/float-clearing.html Removed: trunk/netsurftest/haveproblems/float-clearing.html URL: http://source.netsurf-browser.org/trunk/netsurftest/haveproblems/float-cl... ============================================================================== --- trunk/netsurftest/haveproblems/float-clearing.html (original) +++ trunk/netsurftest/haveproblems/float-clearing.html (removed) @@ -1,51 +1,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" - "http://www.w3.org/TR/html4/strict.dtd"> -<html> -<title>Float row gaps test</title> -<body> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:purple; float:left; clear:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -<div style="height:150px; width:200px; background:red; float:left;"></div> -<div style="height:150px; width:200px; background:blue; float:left;"></div> -</body> -</html> Added: trunk/netsurftest/haveproblems/inline-background.html URL: http://source.netsurf-browser.org/trunk/netsurftest/haveproblems/inline-b... ============================================================================== --- trunk/netsurftest/haveproblems/inline-background.html (added) +++ trunk/netsurftest/haveproblems/inline-background.html Wed Apr 23 14:30:03 2008 @@ -1,0 +1,28 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> +<title>Wrong inline background colour</title> +</head> +<body> +<p>The DIVs below have a red backgrounds, but the text inside is also given red backgrounds, which is wrong. This problem shows up when: + +<ul> +<li>the text overflows out the side of a box: +<div style="background:red; width:10em; padding:2em;"> +Loooooooooooooooooooooooooooooooooooooooooooooooonnnnnnnnnnnnnnnnnnnnngggg. +</div> +</li> +<li>the box has a background image of a different colour: +<div style="background: red url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC); width:10em; padding:2em;"> +Some text. +</div> +</li> +<li>the text overflows out the bottom of a box: +<div style="background:red; width:10em; height:5em; padding:2em;"> +Lots and lots and lots and lots and lots and lots and lots and lots and lots and lots and lots and lots and lots and lots and lots and lots and lots and lots and lots and lots and lots and lots and lots and lots and lots and lots and lots and lots of text. +</div> +</li> +</ul> +</body> +</html> Added: trunk/netsurftest/works/float-clear.html URL: http://source.netsurf-browser.org/trunk/netsurftest/works/float-clear.htm... ============================================================================== --- trunk/netsurftest/works/float-clear.html (added) +++ trunk/netsurftest/works/float-clear.html Wed Apr 23 14:30:03 2008 @@ -1,0 +1,29 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html><head><style> +div { + width:10em; + height:10em; } + +#yellow { + float:right; + background-color:yellow; } + +#green { + clear:both; + float:left; + background-color:green; } + +#red { + float:left; + background-color:red; } +</style></head><body> + + +<div id="yellow">yellow</div> +<div id="green">green</div> +<div id="red">red</div> +</div> + +</body> +</html> Added: trunk/netsurftest/works/float-clear2.html URL: http://source.netsurf-browser.org/trunk/netsurftest/works/float-clear2.ht... ============================================================================== --- trunk/netsurftest/works/float-clear2.html (added) +++ trunk/netsurftest/works/float-clear2.html Wed Apr 23 14:30:03 2008 @@ -1,0 +1,29 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html><head><style> +div { + width:10em; + height:10em; } + +#yellow { + float:right; + background-color:yellow; } + +#green { + clear:right; + float:left; + background-color:green; } + +#red { + float:left; + background-color:red; } +</style></head><body> + + +<div id="yellow">yellow</div> +<div id="green">green</div> +<div id="red">red</div> +</div> + +</body> +</html> Added: trunk/netsurftest/works/float-clear3.html URL: http://source.netsurf-browser.org/trunk/netsurftest/works/float-clear3.ht... ============================================================================== --- trunk/netsurftest/works/float-clear3.html (added) +++ trunk/netsurftest/works/float-clear3.html Wed Apr 23 14:30:03 2008 @@ -1,0 +1,29 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html><head><style> +div { + width:10em; + height:10em; } + +#yellow { + float:right; + background-color:yellow; } + +#green { + clear:both; + float:left; + background-color:green; } + +#red { + float:right; + background-color:red; } +</style></head><body> + + +<div id="yellow">yellow</div> +<div id="green">green</div> +<div id="red">red</div> +</div> + +</body> +</html> Added: trunk/netsurftest/works/float-clear4.html URL: http://source.netsurf-browser.org/trunk/netsurftest/works/float-clear4.ht... ============================================================================== --- trunk/netsurftest/works/float-clear4.html (added) +++ trunk/netsurftest/works/float-clear4.html Wed Apr 23 14:30:03 2008 @@ -1,0 +1,29 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html><head><style> +div { + width:10em; + height:10em; } + +#yellow { + float:right; + background-color:yellow; } + +#green { + clear:right; + float:left; + background-color:green; } + +#red { + float:right; + background-color:red; } +</style></head><body> + + +<div id="yellow">yellow</div> +<div id="green">green</div> +<div id="red">red</div> +</div> + +</body> +</html> Added: trunk/netsurftest/works/float-clear5.html URL: http://source.netsurf-browser.org/trunk/netsurftest/works/float-clear5.ht... ============================================================================== --- trunk/netsurftest/works/float-clear5.html (added) +++ trunk/netsurftest/works/float-clear5.html Wed Apr 23 14:30:03 2008 @@ -1,0 +1,30 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html><head><style> +div { + width:10em; + height:10em; } + +#yellow { + float:right; + background-color:yellow; } + +#green { + clear:both; + float:left; + background-color:green; } + +#red { + float:left; + background-color:red; } +</style></head><body> + + +<div id="yellow">yellow</div> +<div id="green">green</div> +<div style="width:auto;height:auto;">moose</div> +<div id="red">red</div> +</div> + +</body> +</html> Added: trunk/netsurftest/works/float-clear6.html URL: http://source.netsurf-browser.org/trunk/netsurftest/works/float-clear6.ht... ============================================================================== --- trunk/netsurftest/works/float-clear6.html (added) +++ trunk/netsurftest/works/float-clear6.html Wed Apr 23 14:30:03 2008 @@ -1,0 +1,30 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html><head><style> +div { + width:10em; + height:10em; } + +#yellow { + float:right; + background-color:yellow; } + +#green { + clear:both; + float:left; + background-color:green; } + +#red { + float:left; + background-color:red; } +</style></head><body> + + +<div id="yellow">yellow</div> +<div id="green">green</div> +<div style="width:auto;height:auto;">moose</div> +<div id="red" style="width:11em;height:11em;">red</div> +</div> + +</body> +</html> Added: trunk/netsurftest/works/float-clear7.html URL: http://source.netsurf-browser.org/trunk/netsurftest/works/float-clear7.ht... ============================================================================== --- trunk/netsurftest/works/float-clear7.html (added) +++ trunk/netsurftest/works/float-clear7.html Wed Apr 23 14:30:03 2008 @@ -1,0 +1,28 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html><head><style> +div { + width:10em; + height:10em; } + +#yellow { + float:right; + background-color:yellow; } + +#green { + clear:right; + background-color:green; } + +#red { + float:left; + background-color:red; } +</style></head><body> + + +<div id="yellow">yellow</div> +<div id="green" style="width:auto;height:auto;">green</div> +<div id="red">red</div> +</div> + +</body> +</html> Added: trunk/netsurftest/works/minmax-height-1.html URL: http://source.netsurf-browser.org/trunk/netsurftest/works/minmax-height-1... ============================================================================== --- trunk/netsurftest/works/minmax-height-1.html (added) +++ trunk/netsurftest/works/minmax-height-1.html Wed Apr 23 14:30:03 2008 @@ -1,0 +1,12 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> +<title>Min/max-height test</title> +</head> +<body> +<div style="background:red; height:20em; max-height:10em;"> +<div style="background:yellow; height:10em;"></div> +</div> +</body> +</html> Added: trunk/netsurftest/works/minmax-height-2.html URL: http://source.netsurf-browser.org/trunk/netsurftest/works/minmax-height-2... ============================================================================== --- trunk/netsurftest/works/minmax-height-2.html (added) +++ trunk/netsurftest/works/minmax-height-2.html Wed Apr 23 14:30:03 2008 @@ -1,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> +<title>Min/max-height test</title> +</head> +<body> +<div style="background:red; max-height:10em; overflow:hidden;"> +<div style="background:yellow; height:10em;"></div> +<div style="background:blue; height:10em;"></div> +</div> +</body> +</html> Added: trunk/netsurftest/works/minmax-height-3.html URL: http://source.netsurf-browser.org/trunk/netsurftest/works/minmax-height-3... ============================================================================== --- trunk/netsurftest/works/minmax-height-3.html (added) +++ trunk/netsurftest/works/minmax-height-3.html Wed Apr 23 14:30:03 2008 @@ -1,0 +1,12 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> +<title>Min/max-height test</title> +</head> +<body> +<div style="background:red; min-height:20em;"> +<div style="background:yellow; height:10em;"></div> +</div> +</body> +</html> Added: trunk/netsurftest/works/minmax-height-4.html URL: http://source.netsurf-browser.org/trunk/netsurftest/works/minmax-height-4... ============================================================================== --- trunk/netsurftest/works/minmax-height-4.html (added) +++ trunk/netsurftest/works/minmax-height-4.html Wed Apr 23 14:30:03 2008 @@ -1,0 +1,12 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> +<title>Min/max-height test</title> +</head> +<body> +<div style="background:red; max-height:10em; overflow:hidden;"> +<div style="background:yellow; height:20em;"></div> +</div> +</body> +</html> Added: trunk/netsurftest/works/minmax-height-5.html URL: http://source.netsurf-browser.org/trunk/netsurftest/works/minmax-height-5... ============================================================================== --- trunk/netsurftest/works/minmax-height-5.html (added) +++ trunk/netsurftest/works/minmax-height-5.html Wed Apr 23 14:30:03 2008 @@ -1,0 +1,10 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> +<title>Min/max-height test</title> +</head> +<body> +<p style="background:red; max-height:10em; overflow:hidden;">This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on. This is a lot of text. It goes on and on and on. Blah etc, and so on.</p> +</body> +</html>

15 years, 7 months

1
0
0 / 0

r4104 tlsa - in /trunk/netsurf/render: box.h layout.c

by netsurf＠semichrome.net

Author: tlsa Date: Wed Apr 23 13:49:11 2008 New Revision: 4104 URL: http://source.netsurf-browser.org?rev=4104&view=rev Log: Make floats that follow a cleared float heed the clear. Fixes position of search form on BBC homepage. Modified: trunk/netsurf/render/box.h trunk/netsurf/render/layout.c Modified: trunk/netsurf/render/box.h URL: http://source.netsurf-browser.org/trunk/netsurf/render/box.h?rev=4104&r1=... ============================================================================== --- trunk/netsurf/render/box.h (original) +++ trunk/netsurf/render/box.h Wed Apr 23 13:49:11 2008 @@ -205,6 +205,9 @@ struct box *float_children; /** Next sibling float box. */ struct box *next_float; + /** Level below which subsequent floats must be cleared. + * This is used only for boxes with float_children */ + int clear_level; /** List marker box if this is a list-item, or 0. */ struct box *list_marker; Modified: trunk/netsurf/render/layout.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/layout.c?rev=4104&... ============================================================================== --- trunk/netsurf/render/layout.c (original) +++ trunk/netsurf/render/layout.c Wed Apr 23 13:49:11 2008 @@ -227,6 +227,7 @@ #endif block->float_children = 0; + block->clear_level = 0; /* special case if the block contains an object */ if (block->object) { @@ -1469,7 +1470,8 @@ if (d->style && d->style->clear == CSS_CLEAR_NONE && (b->width <= (x1 - x0) - x || - (left == 0 && right == 0 && x == 0))) { + (left == 0 && right == 0 && x == 0)) && + cy >= cont->clear_level) { /* not cleared * fits next to this line, or this line is * empty with no floats */ @@ -1482,12 +1484,20 @@ x1 -= b->width; right = b; } - b->y = cy; + /* Heed any previous clear */ + if (cy < cont->clear_level) { + b->y = cont->clear_level; + } else { + b->y = cy; + } } else { /* cleared or doesn't fit */ /* place below into next available space */ + fy = (cy > cont->clear_level) ? cy : + cont->clear_level; + place_float_below(b, *width, - cx, cy + height, cont); + cx, fy + height, cont); if (d->style && d->style->clear != CSS_CLEAR_NONE) { /* to be cleared below existing @@ -1503,9 +1513,10 @@ } fy = layout_clear(cont->float_children, d->style->clear); + if (fy > cont->clear_level) + cont->clear_level = fy; if (b->y < fy) b->y = fy; - } } if (cont->float_children == b) {

15 years, 7 months

1
0
0 / 0

r4103 tlsa - /trunk/netsurf/render/table.c

by netsurf＠semichrome.net

Author: tlsa Date: Wed Apr 23 05:45:46 2008 New Revision: 4103 URL: http://source.netsurf-browser.org?rev=4103&view=rev Log: Maybe fix table layout problem caused by r4100. Modified: trunk/netsurf/render/table.c Modified: trunk/netsurf/render/table.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/table.c?rev=4103&r... ============================================================================== --- trunk/netsurf/render/table.c (original) +++ trunk/netsurf/render/table.c Wed Apr 23 05:45:46 2008 @@ -122,6 +122,10 @@ continue; i = cell->start_column; + for (j = i; j < i + cell->columns; j++) { + col[j].positioned = false; + } + /* count column types in spanned cells */ for (j = 0; j != cell->columns; j++) { if (col[i + j].type == COLUMN_WIDTH_FIXED) {

15 years, 7 months

1
0
0 / 0

r4102 tlsa - in /trunk/netsurfweb: about/news.en developers/gsoc.en index.en

by netsurf＠semichrome.net

Author: tlsa Date: Tue Apr 22 15:59:42 2008 New Revision: 4102 URL: http://source.netsurf-browser.org?rev=4102&view=rev Log: Update news. Modified: trunk/netsurfweb/about/news.en trunk/netsurfweb/developers/gsoc.en trunk/netsurfweb/index.en Modified: trunk/netsurfweb/about/news.en URL: http://source.netsurf-browser.org/trunk/netsurfweb/about/news.en?rev=4102... ============================================================================== --- trunk/netsurfweb/about/news.en (original) +++ trunk/netsurfweb/about/news.en Tue Apr 22 15:59:42 2008 @@ -48,6 +48,8 @@ <h1>News</h1> <dl class="news"> +<dt><a href="/developers/gsoc">GSoC projects selected</a> <span>22 Apr 2008</span></dt> +<dd>The student projects that will be carried out this summer have been announced. See our <a href="/developers/gsoc">GSoC page</a> for details.<dd> <dt><a href="/downloads/">NetSurf 1.2 released</a> <span>22 Mar 2008</span></dt> <dd>The second update to NetSurf 1 has been released. It offers several bug fixes over the previous release and we recommend that users upgrade.<dd> <dt><a href="/developers/gsoc">Google Summer of Code</a> <span>17 Mar 2008</span></dt> Modified: trunk/netsurfweb/developers/gsoc.en URL: http://source.netsurf-browser.org/trunk/netsurfweb/developers/gsoc.en?rev... ============================================================================== --- trunk/netsurfweb/developers/gsoc.en (original) +++ trunk/netsurfweb/developers/gsoc.en Tue Apr 22 15:59:42 2008 @@ -41,7 +41,41 @@ <p class="breadcrumbs"><a href="/">Home</a> » <a href="/developers/">Developer area</a> » Google Summer of Code Ideas</p> -<h1>Google Summer of Code Ideas</h1> +<h1>Google Summer of Code</h1> + +<p><strong>News:</strong> Our four Google Summer of Code students have been selected.</p> + +<dl> +<dt>Adam Blokus</dt> +<dd> +<ul> +<li>PDF Plotter and printing improvements</li> +<li>Mentor: John Tytgat (joty)</li> +</ul> +</dd> +<dt>Sean Fox</dt> +<dd> +<ul> +<li>Abstract the Core Functionality to Stand-alone Libraries</li> +<li>Mentor: James Bursa (zamez)</li> +</ul> +</dd> +<dt>William Michael Lester</dt> +<dd> +<ul> +<li>Improved GTK Frontend</li> +<li>Mentor: Rob Kendrick (rjek)</li> +</ul> +</dd> +<dt>Andrew Sidwell</dt> +<dd> +<ul> +<li>Work on and integrate Hubbub</li> +<li>Mentor: John-Mark Bell (jmb)</li> +</ul> +</dd> +</dl> + <p>This page lists project ideas for <strong><a href="http://code.google.com/soc/2008/">Google Summer of Code 2008</a></strong>.</p> <dl> Modified: trunk/netsurfweb/index.en URL: http://source.netsurf-browser.org/trunk/netsurfweb/index.en?rev=4102&r1=4... ============================================================================== --- trunk/netsurfweb/index.en (original) +++ trunk/netsurfweb/index.en Tue Apr 22 15:59:42 2008 @@ -114,12 +114,12 @@ <h2 id="news">Latest news</h2> <dl class="frontnews"> +<dt><a href="/developers/gsoc">GSoC projects selected</a> <span>22 Apr 2008</span></dt> +<dd>The student projects that will be carried out this summer have been announced. See our <a href="/developers/gsoc">GSoC page</a> for details.<dd> <dt><a href="/downloads/">NetSurf 1.2 released</a> <span>22 Mar 2008</span></dt> <dd>The second update to NetSurf 1 has been released. It offers many bug fixes and improvements over the previous release. We recommend that users upgrade.<dd> <dt><a href="http://vlists.pepperfish.net/pipermail/netsurf-users-netsurf-browser.org/...">Google Summer of Code</a> <span>17 Mar 2008</span></dt> <dd>NetSurf is participating in Google Summer of Code 2008, as a mentoring organisation. Students interested in getting involved should apply to Google. More information on our <a href="/developers/gsoc">GSoC</a> page.<dd> -<dt><a href="http://vlists.pepperfish.net/pipermail/netsurf-users-netsurf-browser.org/...">Summary of recent development</a> <span>02 Mar 2008</span></dt> -<dd>Pages are now periodically reflowed as images are downloaded. Handling of presentational markup is improved. Better form element handling and many other fixes and improvements.<dd> </dl> <p class="more"><a href="/about/news" class="seemore">See more news</a></p>

15 years, 7 months

1
0
0 / 0

r4101 tlsa - /trunk/netsurf/render/layout.c

by netsurf＠semichrome.net

Author: tlsa Date: Mon Apr 21 17:02:33 2008 New Revision: 4101 URL: http://source.netsurf-browser.org?rev=4101&view=rev Log: Fix absolute positioning when there's a float between the box and its containing block. Modified: trunk/netsurf/render/layout.c Modified: trunk/netsurf/render/layout.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/layout.c?rev=4101&... ============================================================================== --- trunk/netsurf/render/layout.c (original) +++ trunk/netsurf/render/layout.c Mon Apr 21 17:02:33 2008 @@ -2835,8 +2835,29 @@ if (!layout_position_absolute(c, c, 0, 0, content)) return false; } else { + int px, py; + if (c->style && (c->style->float_ == CSS_FLOAT_LEFT || + c->style->float_ == CSS_FLOAT_RIGHT)) { + /* Float x/y coords are relative to nearest + * ansestor with float_children, rather than + * relative to parent. Need to get x/y relative + * to parent */ + struct box *p; + px = c->x; + py = c->y; + for (p = box->parent; p && !p->float_children; + p = p->parent) { + px -= p->x; + py -= p->y; + } + } else { + /* Not a float, so box x/y coords are relative + * to parent */ + px = c->x; + py = c->y; + } if (!layout_position_absolute(c, containing_block, - cx + c->x, cy + c->y, content)) + cx + px, cy + py, content)) return false; } }

15 years, 7 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits April 2008