Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

QScriptLine cleanup

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-07-13 21:22:41 +00:00
parent e99f6d4b87
commit 01ae444554
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gui/text/qtextengine_p.h
View file

@ -353,8 +353,8 @@ struct Q_AUTOTEST_EXPORT QScriptLine
// created and filled in QTextLine::layout_helper // created and filled in QTextLine::layout_helper
QScriptLine() QScriptLine()
: from(0), trailingSpaces(0), length(0), : from(0), trailingSpaces(0), length(0),
justified(0), gridfitted(0), justified(false), gridfitted(false),
hasTrailingSpaces(0), leadingIncluded(0) {} hasTrailingSpaces(false), leadingIncluded(false) {}
QFixed descent; QFixed descent;
QFixed ascent; QFixed ascent;
QFixed leading; QFixed leading;
@ -364,12 +364,12 @@ struct Q_AUTOTEST_EXPORT QScriptLine
QFixed textWidth; QFixed textWidth;
QFixed textAdvance; QFixed textAdvance;
int from; int from;
unsigned short trailingSpaces; ushort trailingSpaces;
signed int length : 28; int length;
mutable uint justified : 1; mutable bool justified;
mutable uint gridfitted : 1; mutable bool gridfitted;
uint hasTrailingSpaces : 1; bool hasTrailingSpaces;
uint leadingIncluded : 1; bool leadingIncluded;
QFixed height() const { return (ascent + descent).ceil() + 1 QFixed height() const { return (ascent + descent).ceil() + 1
+ (leadingIncluded? qMax(QFixed(),leading) : QFixed()); } + (leadingIncluded? qMax(QFixed(),leading) : QFixed()); }
QFixed base() const { return ascent QFixed base() const { return ascent