chatterino2
Code Issues

Fixed deprecated method QFontMetrics::width (#2509)

Browse Source 
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
This commit is contained in:
Paweł
2021-03-13 14:47:02 +01:00
committed by GitHub
parent d94d9e74dd
commit 0e99527e8c
5 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/messages/MessageElement.cpp
+8 -6
View File
@@ -320,7 +320,7 @@ void TextElement::addToContainer(MessageLayoutContainer &container,
// fourtf: add again
// if (word.width == -1) {
word.width = metrics.width(word.text);
word.width = metrics.horizontalAdvance(word.text);
// }
// see if the text fits in the current line
@@ -357,8 +357,9 @@ void TextElement::addToContainer(MessageLayoutContainer &container,
auto isSurrogate = text.size() > i + 1 &&
QChar::isHighSurrogate(text[i].unicode());
auto charWidth = isSurrogate ? metrics.width(text.mid(i, 2))
: metrics.width(text[i]);
auto charWidth = isSurrogate
? metrics.horizontalAdvance(text.mid(i, 2))
: metrics.horizontalAdvance(text[i]);
if (!container.fitsInLine(width + charWidth))
{
@@ -585,7 +586,7 @@ void IrcTextElement::addToContainer(MessageLayoutContainer &container,
// fourtf: add again
// if (word.width == -1) {
word.width = metrics.width(word.text);
word.width = metrics.horizontalAdvance(word.text);
// }
// see if the text fits in the current line
@@ -632,8 +633,9 @@ void IrcTextElement::addToContainer(MessageLayoutContainer &container,
auto isSurrogate = text.size() > i + 1 &&
QChar::isHighSurrogate(text[i].unicode());
auto charWidth = isSurrogate ? metrics.width(text.mid(i, 2))
: metrics.width(text[i]);
auto charWidth = isSurrogate
? metrics.horizontalAdvance(text.mid(i, 2))
: metrics.horizontalAdvance(text[i]);
if (!container.fitsInLine(width + charWidth))
{