From 0312682e070065e0c7aa70fc29d5c96a8119e40c Mon Sep 17 00:00:00 2001 From: Uwe Kindler Date: Sat, 2 Jan 2021 20:50:26 +0100 Subject: [PATCH] Fixed wrong pixmap is null test in ElidingLabel --- src/ElidingLabel.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ElidingLabel.cpp b/src/ElidingLabel.cpp index b95a7f6..75dc289 100644 --- a/src/ElidingLabel.cpp +++ b/src/ElidingLabel.cpp @@ -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(); }