summaryrefslogtreecommitdiff
path: root/render/layout.c
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2012-10-03 17:14:11 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2012-10-03 17:14:11 +0100
commit391defb1c4cff592aa228ced1c6278d30ea31030 (patch)
treef45db384fd8668b1e5f1ff7e79c6dcbfc2ca7a38 /render/layout.c
parentb68a138c2c807559ae584bdb0bb5d392fb1f0870 (diff)
downloadnetsurf-391defb1c4cff592aa228ced1c6278d30ea31030.tar.gz
netsurf-391defb1c4cff592aa228ced1c6278d30ea31030.tar.bz2
Don't convert spaces to non-breaking spaces inside white-space:pre. Instead, handle not wrapping in layout.
Diffstat (limited to 'render/layout.c')
-rw-r--r--render/layout.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/render/layout.c b/render/layout.c
index ead01acf0..0523cf9db 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -2700,7 +2700,9 @@ bool layout_line(struct box *first, int *width, int *y,
size_t space = 0;
int w;
bool no_wrap = css_computed_white_space(
- split_box->style) == CSS_WHITE_SPACE_NOWRAP;
+ split_box->style) == CSS_WHITE_SPACE_NOWRAP ||
+ css_computed_white_space(
+ split_box->style) == CSS_WHITE_SPACE_PRE;
x = x_previous;