Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-17 07:46:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Working on line height

Browse source
This commit is contained in:
Brad Davis 2015-07-17 14:33:32 -07:00
parent 24643ca282
commit 914b47069b
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/TextOverlayElement.qml
View file

@ -17,7 +17,7 @@ TextOverlayElement {
font.family: root.fontFamily
font.pixelSize: root.fontSize
lineHeightMode: Text.FixedHeight
lineHeight: root.fontSize * 1.2
lineHeight: root.lineHeight
}
}
}

13
interface/src/ui/overlays/TextOverlay.cpp
View file

@ -47,6 +47,7 @@ private:
TEXT_OVERLAY_PROPERTY(QString, textColor, "#ffffffff")
TEXT_OVERLAY_PROPERTY(QString, backgroundColor, "#B2000000")
TEXT_OVERLAY_PROPERTY(qreal, fontSize, 18)
TEXT_OVERLAY_PROPERTY(qreal, lineHeight, 18)
TEXT_OVERLAY_PROPERTY(qreal, leftMargin, 0)
TEXT_OVERLAY_PROPERTY(qreal, topMargin, 0)
@ -58,6 +59,7 @@ signals:
void textChanged();
void fontFamilyChanged();
void fontSizeChanged();
void lineHeightChanged();
void leftMarginChanged();
void topMarginChanged();
void textColorChanged();
@ -167,6 +169,10 @@ void TextOverlay::setProperties(const QScriptValue& properties) {
if (font.property("size").isValid()) {
setFontSize(font.property("size").toInt32());
}
QFont font(_qmlElement->fontFamily());
font.setPixelSize(_qmlElement->fontSize());
QFontMetrics fm(font);
_qmlElement->setlineHeight(fm.lineSpacing() * 1.2);
}
QScriptValue text = properties.property("text");
@ -236,9 +242,10 @@ QSizeF TextOverlay::textSize(const QString& text) const {
++lines;
}
}
QFontMetrics fm(QFont(SANS_FONT_FAMILY, _fontSize));
QSizeF result = QSizeF(fm.width(text), fm.lineSpacing() * lines);
result.rheight() *= 1.2;
QFont font(_qmlElement->fontFamily());
font.setPixelSize(_qmlElement->fontSize());
QFontMetrics fm(font);
QSizeF result = QSizeF(fm.width(text), _qmlElement->lineHeight() * lines);
return result;
}