1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge pull request #3571

Diadlo (1):
      fix(text): Using modified text, instead of raw
This commit is contained in:
sudden6 2016-08-01 21:53:35 +02:00
commit 6296f5de34
No known key found for this signature in database
GPG Key ID: 279509B499E032B9

View File

@ -243,17 +243,17 @@ void Text::regenerate()
{
doc->setDefaultFont(defFont);
if (!elide)
if (elide)
{
doc->setDefaultStyleSheet(defStyleSheet);
doc->setHtml(text);
QFontMetrics metrics = QFontMetrics(defFont);
QString elidedText = metrics.elidedText(text, Qt::ElideRight, qRound(width));
doc->setPlainText(elidedText);
}
else
{
QFontMetrics metrics = QFontMetrics(defFont);
QString elidedText = metrics.elidedText(rawText, Qt::ElideRight,
qRound(width));
doc->setPlainText(elidedText);
doc->setDefaultStyleSheet(defStyleSheet);
doc->setHtml(text);
}
// wrap mode