Limit heght of PixmapLabel to 20 pixels

Becoming smaller bring the pixmap to flickering in some situations when resizing the attribute form
qgis · Nov 15, 2021 · bfab3f7 · bfab3f7
1 parent 8ceff0e
commit bfab3f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/gui/qgspixmaplabel.cpp b/src/gui/qgspixmaplabel.cpp
@@ -19,14 +19,18 @@
 QgsPixmapLabel::QgsPixmapLabel( QWidget *parent )
   : QLabel( parent )
 {
-  this->setMinimumSize( 1, 1 );
 }
 
 void QgsPixmapLabel::setPixmap( const QPixmap &p )
 {
   const bool sizeChanged = ( p.size() != mPixmap.size() );
   mPixmap = p;
 
+  if ( mPixmap.isNull() )
+    this->setMinimumHeight( 0 );
+  else
+    this->setMinimumHeight( PIXMAP_MINIMUM_HEIGHT );
+
   if ( sizeChanged )
   {
     updateGeometry();
@@ -66,4 +70,5 @@ void QgsPixmapLabel::clear()
 {
   mPixmap = QPixmap();
   QLabel::clear();
+  this->setMinimumHeight( 0 );
 }
diff --git a/src/gui/qgspixmaplabel.h b/src/gui/qgspixmaplabel.h
@@ -59,6 +59,8 @@ class GUI_EXPORT QgsPixmapLabel : public QLabel
 
   private:
 
+    static const int PIXMAP_MINIMUM_HEIGHT = 20;
+
     QPixmap mPixmap;
 };