medvedych/harbour-books
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Sum up lineStart/EndIndent values rather than overwrite them

Browse source 
Perhaps the same thing should be done to vertical margins as well.
This commit is contained in:
Slava Monich 2015-06-26 23:47:46 +03:00
parent 562c507a75
commit 9629f7bb46
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fbreader/fbreader/zlibrary/text/src/style/ZLTextDecoratedStyle.cpp
View file

@ -125,20 +125,20 @@ short ZLTextForcedStyle::lineStartIndent(const ZLTextStyleEntry::Metrics &metric
ZLTextStyleEntry::Length lengthType = rtl ? ZLTextStyleEntry::Length lengthType = rtl ?
ZLTextStyleEntry::LENGTH_RIGHT_INDENT : ZLTextStyleEntry::LENGTH_RIGHT_INDENT :
ZLTextStyleEntry::LENGTH_LEFT_INDENT; ZLTextStyleEntry::LENGTH_LEFT_INDENT;
return return base()->lineStartIndent(metrics, rtl) + (
myEntry.lengthSupported(lengthType) ? myEntry.lengthSupported(lengthType) ?
myEntry.length(lengthType, metrics) : myEntry.length(lengthType, metrics) :
base()->lineStartIndent(metrics, rtl); 0);
} }
short ZLTextForcedStyle::lineEndIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const { short ZLTextForcedStyle::lineEndIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const {
ZLTextStyleEntry::Length lengthType = rtl ? ZLTextStyleEntry::Length lengthType = rtl ?
ZLTextStyleEntry::LENGTH_LEFT_INDENT : ZLTextStyleEntry::LENGTH_LEFT_INDENT :
ZLTextStyleEntry::LENGTH_RIGHT_INDENT; ZLTextStyleEntry::LENGTH_RIGHT_INDENT;
return return base()->lineEndIndent(metrics, rtl) + (
myEntry.lengthSupported(lengthType) ? myEntry.lengthSupported(lengthType) ?
myEntry.length(lengthType, metrics) : myEntry.length(lengthType, metrics) :
base()->lineEndIndent(metrics, rtl); 0);
} }
short ZLTextForcedStyle::spaceBefore(const ZLTextStyleEntry::Metrics &metrics) const { short ZLTextForcedStyle::spaceBefore(const ZLTextStyleEntry::Metrics &metrics) const {