diff options
author | Sebastian Geerken <devnull@localhost> | 2015-01-08 22:13:33 +0100 |
---|---|---|
committer | Sebastian Geerken <devnull@localhost> | 2015-01-08 22:13:33 +0100 |
commit | edc1eb11e478c41e1f5e18eb76f78e0a060b831c (patch) | |
tree | 205ed3a672458073d93592c2dff3bc317a713a59 | |
parent | f3df745485d7e64d3fff29f6e98cf2ec12da2949 (diff) |
Size of inline-blocks with left floats: works now.
-rw-r--r-- | dw/textblock_linebreaking.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dw/textblock_linebreaking.cc b/dw/textblock_linebreaking.cc index a95abc94..d458d4c5 100644 --- a/dw/textblock_linebreaking.cc +++ b/dw/textblock_linebreaking.cc @@ -437,12 +437,12 @@ Textblock::Line *Textblock::addLine (int firstWord, int lastWord, // Until here, lineWidth refers does not include floats on the left // side. To include left floats, so that maxLineWidth, and - // eventually the requisition, is correct, line->textOffset has to - // be added, which was calculated just before in calcTextOffset(). - // The correction in sizeAllocateImpl() is irrelevant in this - // regard. Also, right floats are not regarded here, but in + // eventually the requisition, is correct, line->leftOffset (minus + // margin+border+padding) has to be added, which was calculated + // just before. The correction in sizeAllocateImpl() is irrelevant + // in this regard. Also, right floats are not regarded here, but in // OutOfFlowMgr::getSize(), - //lineWidth += line->textOffset; -- TODO: Does not work! + lineWidth += (line->leftOffset - getStyle()->boxOffsetX ()); if (lines->size () == 1) { // first line |