diff options
| author | Sebastian Geerken <devnull@localhost> | 2013-06-12 15:48:52 +0200 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2013-06-12 15:48:52 +0200 |
| commit | fa25119df4ad93bff4edbe592ba26d7ffb5daa22 (patch) | |
| tree | 3407f366699f4786da40ec2ea0c32e342036859a | |
| parent | e931583f64cc0a85273bc75cc9996f584e45952f (diff) | |
| parent | efe6750f08f61dc3e3930939fd89f29b62484780 (diff) | |
Merge.
| -rw-r--r-- | dw/textblock_linebreaking.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dw/textblock_linebreaking.cc b/dw/textblock_linebreaking.cc index a150c043..3372485e 100644 --- a/dw/textblock_linebreaking.cc +++ b/dw/textblock_linebreaking.cc @@ -397,8 +397,9 @@ Textblock::Line *Textblock::addLine (int firstWord, int lastWord, line->boxAscent = misc::max (line->boxAscent, 1); // Calculate offsetCompleteWidget, which includes also floats. + int leftBorder = mustBorderBeRegarded (line) ? newLineLeftBorder : 0; line->offsetCompleteWidget = - misc::max (newLineLeftBorder, + misc::max (leftBorder, getStyle()->boxOffsetX() + innerPadding + (lineIndex == 0 ? line1OffsetEff : 0)) + line->leftOffset; |