summaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2012-10-03 15:41:32 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2012-10-03 15:41:32 +0100
commitac43c2eaeaf8f30aefd3b6f2415d031d60bc69ce (patch)
tree0ad5a390d29c394b5977e1452dc30c0a760a6422 /render
parentb6202ab8cf8e80ea17bb47a5bf64f0fbb3d2fb29 (diff)
downloadnetsurf-ac43c2eaeaf8f30aefd3b6f2415d031d60bc69ce.tar.gz
netsurf-ac43c2eaeaf8f30aefd3b6f2415d031d60bc69ce.tar.bz2
Support white-space:nowrap.
Diffstat (limited to 'render')
-rw-r--r--render/layout.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/render/layout.c b/render/layout.c
index 0c672f145..1b2e43b6e 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -2744,8 +2744,11 @@ bool layout_line(struct box *first, int *width, int *y,
!left && !right && inline_count == 1) {
/* first word of box doesn't fit, but no floats and
* first box on line so force in */
- if (space == 0) {
- /* only one word in this box or not text */
+ if (space == 0 || css_computed_white_space(
+ split_box->style) ==
+ CSS_WHITE_SPACE_NOWRAP) {
+ /* only one word in this box, or not text
+ * or white-space:nowrap */
b = split_box->next;
} else {
/* cut off first word for this line */