diff options
author | Sebastian Geerken <devnull@localhost> | 2014-05-29 19:26:24 +0200 |
---|---|---|
committer | Sebastian Geerken <devnull@localhost> | 2014-05-29 19:26:24 +0200 |
commit | d65e9300723acb265e5e67925f155b85c4e3725f (patch) | |
tree | d0cfb867680a3f3061a282a64c8a2916bb6b6b66 /dw/textblock_linebreaking.cc | |
parent | 8b7eb5032c7d40e6fe0fe21aff2523b7fa14e8f2 (diff) |
Some renaming and cleanup.
Diffstat (limited to 'dw/textblock_linebreaking.cc')
-rw-r--r-- | dw/textblock_linebreaking.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dw/textblock_linebreaking.cc b/dw/textblock_linebreaking.cc index 6e9575e0..7b9110ee 100644 --- a/dw/textblock_linebreaking.cc +++ b/dw/textblock_linebreaking.cc @@ -1602,7 +1602,7 @@ int Textblock::calcAvailWidth (int lineIndex) lineIndex, lines->size()); DBG_OBJ_MSG_START (); - int availWidth = this->availWidth - innerPadding; + int availWidth = this->lineBreakWidth - innerPadding; if (limitTextWidth && layout->getUsesViewport () && // margin/border/padding will be subtracted later, via OOFM. @@ -1639,7 +1639,7 @@ void Textblock::initLine1Offset (int wordIndex) /* Test whether line1Offset can be used. */ if (wordIndex == 0) { if (ignoreLine1OffsetSometimes && - line1Offset + word->size.width > availWidth) { + line1Offset + word->size.width > lineBreakWidth) { line1OffsetEff = 0; } else { int indent = 0; @@ -1650,7 +1650,7 @@ void Textblock::initLine1Offset (int wordIndex) } else { if (core::style::isPerLength(getStyle()->textIndent)) { indent = core::style::multiplyWithPerLengthRounded - (this->availWidth, getStyle()->textIndent); + (lineBreakWidth, getStyle()->textIndent); } else { indent = core::style::absLengthVal (getStyle()->textIndent); } |