mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-11-15 21:25:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #57 from simulton/master

Browse Source 
Fix PR #44
This commit is contained in:
githubuser0xFFFF 2019-09-09 15:16:19 +02:00 committed by GitHub
commit 3fcf05fb29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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();
#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
QSize size(fm.horizontalAdvance(d->Text.left(2) + "…"), fm.height());
#else
QSize size(fm.width(d->Text.left(2) + "…"), fm.height()); QSize size(fm.width(d->Text.left(2) + "…"), fm.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();
#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()); QSize size(fm.width(d->Text), QLabel::sizeHint().height());
#endif
return size; return size;
} }