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

Fixed wrong pixmap is null test in ElidingLabel

Browse Source
This commit is contained in:
Uwe Kindler 2021-01-02 20:50:26 +01:00
parent 8d14068df7
commit 0312682e07
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ElidingLabel.cpp
View File

@ -164,11 +164,11 @@ void CElidingLabel::resizeEvent(QResizeEvent *event)
QSize CElidingLabel::minimumSizeHint() const
{
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
bool NoPixmap = pixmap().isNull();
bool HasPixmap = !pixmap().isNull();
#else
bool NoPixmap = (pixmap() == nullptr);
bool HasPixmap = (pixmap() != nullptr);
#endif
if (NoPixmap || d->isModeElideNone())
if (HasPixmap || d->isModeElideNone())
{
return QLabel::minimumSizeHint();
}
@ -186,11 +186,11 @@ QSize CElidingLabel::minimumSizeHint() const
QSize CElidingLabel::sizeHint() const
{
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
bool NoPixmap = pixmap().isNull();
bool HasPixmap = !pixmap().isNull();
#else
bool NoPixmap = (pixmap() == nullptr);
bool HasPixmap = (pixmap() != nullptr);
#endif
if (NoPixmap || d->isModeElideNone())
if (HasPixmap || d->isModeElideNone())
{
return QLabel::sizeHint();
}