equal
deleted
inserted
replaced
387 signed int length : 29; |
387 signed int length : 29; |
388 mutable uint justified : 1; |
388 mutable uint justified : 1; |
389 mutable uint gridfitted : 1; |
389 mutable uint gridfitted : 1; |
390 uint hasTrailingSpaces : 1; |
390 uint hasTrailingSpaces : 1; |
391 uint leadingIncluded : 1; |
391 uint leadingIncluded : 1; |
392 QFixed height() const { return ascent + descent + 1 |
392 QFixed height() const { return (ascent + descent).ceil() + 1 |
393 + (leadingIncluded? qMax(QFixed(),leading) : QFixed()); } |
393 + (leadingIncluded? qMax(QFixed(),leading) : QFixed()); } |
394 QFixed base() const { return ascent |
394 QFixed base() const { return ascent |
395 + (leadingIncluded ? qMax(QFixed(),leading) : QFixed()); } |
395 + (leadingIncluded ? qMax(QFixed(),leading) : QFixed()); } |
396 void setDefaultHeight(QTextEngine *eng); |
396 void setDefaultHeight(QTextEngine *eng); |
397 void operator+=(const QScriptLine &other); |
397 void operator+=(const QScriptLine &other); |