aboutsummaryrefslogtreecommitdiff
path: root/dw/textblock.cc
diff options
context:
space:
mode:
authorcorvid <corvid@lavabit.com>2009-10-29 15:40:55 +0000
committercorvid <corvid@lavabit.com>2009-10-29 15:40:55 +0000
commit02d471f2cdc4173268ee92c20fef13b57a615a2c (patch)
treef417402f5d446462bee8b6f4de089400a5174949 /dw/textblock.cc
parente353d450e5475fb9a474d5035751390847cb01b1 (diff)
return to earlier-space-style-prevails
I had changed it in rev. f231450b81a1 a few days ago. http://lists.auriga.wearlab.de/pipermail/dillo-dev/2009-October/006943.html
Diffstat (limited to 'dw/textblock.cc')
-rw-r--r--dw/textblock.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/dw/textblock.cc b/dw/textblock.cc
index 8efd327d..76c7569d 100644
--- a/dw/textblock.cc
+++ b/dw/textblock.cc
@@ -1690,16 +1690,16 @@ void Textblock::addSpace (core::style::Style *style)
if (wordIndex >= 0) {
Word *word = words->getRef(wordIndex);
- word->effSpace = word->origSpace = style->font->spaceWidth;
- word->content.space = true;
-
- //DBG_OBJ_ARRSET_NUM (page, "words.%d.orig_space", nw,
- // page->words[nw].orig_space);
- //DBG_OBJ_ARRSET_NUM (page, "words.%d.eff_space", nw,
- // page->words[nw].eff_space);
- //DBG_OBJ_ARRSET_NUM (page, "words.%d.content.space", nw,
- // page->words[nw].content.space);
- if (style != word->spaceStyle) {
+ if (!word->content.space) {
+ word->content.space = true;
+ word->effSpace = word->origSpace = style->font->spaceWidth;
+
+ //DBG_OBJ_ARRSET_NUM (page, "words.%d.orig_space", nw,
+ // page->words[nw].orig_space);
+ //DBG_OBJ_ARRSET_NUM (page, "words.%d.eff_space", nw,
+ // page->words[nw].eff_space);
+ //DBG_OBJ_ARRSET_NUM (page, "words.%d.content.space", nw,
+ // page->words[nw].content.space);
word->spaceStyle->unref ();
word->spaceStyle = style;
style->ref ();