mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-12-26 08:01:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace deprecated function call

Browse Source 
QFontMetrics::width() has been deprecated. Using QFontMetrics::horizontalAdvance() is the proper way to go (introduce in Qt 5.11).
This commit is contained in:
Joel Bodenmann 2019-08-06 22:36:27 +02:00
parent 0b88843d76
commit 2b7232c9b3
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ElidingLabel.cpp
View File

@ -157,7 +157,11 @@ QSize CElidingLabel::minimumSizeHint() const
return QLabel::minimumSizeHint(); return QLabel::minimumSizeHint();
} }
const QFontMetrics &fm = fontMetrics(); const QFontMetrics &fm = fontMetrics();
QSize size(fm.width(d->Text.left(2) + "…"), fm.height()); #if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
QSize size(fm.horizontalAdvance(d->Text), QLabel::sizeHint().height());
#else
QSize size(fm.width(d->Text), QLabel::sizeHint().height());
#endif
return size; return size;
} }
@ -170,7 +174,11 @@ QSize CElidingLabel::sizeHint() const
return QLabel::sizeHint(); return QLabel::sizeHint();
} }
const QFontMetrics& fm = fontMetrics(); const QFontMetrics& fm = fontMetrics();
QSize size(fm.width(d->Text), QLabel::sizeHint().height()); #if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
QSize size(fm.horizontalAdvance(d->Text), QLabel::sizeHint().height());
#else
QSize size(fm.width(d->Text), QLabel::sizeHint().height());
#endif
return size; return size;
} }