diff --git a/src/gui/qgslegendpatchshapebutton.cpp b/src/gui/qgslegendpatchshapebutton.cpp index 6370d78bc8c..97bd1458fe9 100644 --- a/src/gui/qgslegendpatchshapebutton.cpp +++ b/src/gui/qgslegendpatchshapebutton.cpp @@ -207,7 +207,7 @@ void QgsLegendPatchShapeButton::prepareMenu() { if ( const QgsSymbol *symbol = QgsStyle::defaultStyle()->previewSymbolForPatchShape( shape ) ) { - QIcon icon = QgsSymbolLayerUtils::symbolPreviewPixmap( symbol, QSize( iconSize, iconSize ), 1, nullptr, false, nullptr, &shape ); + QIcon icon = QgsSymbolLayerUtils::symbolPreviewPixmap( symbol, QSize( iconSize, iconSize ), 1, nullptr, false, nullptr, &shape, screen() ); QAction *action = new QAction( name, this ); action->setIcon( icon ); connect( action, &QAction::triggered, this, [ = ] { loadPatchFromStyle( name ); } ); @@ -297,11 +297,11 @@ void QgsLegendPatchShapeButton::updatePreview() int width = static_cast< int >( Qgis::UI_SCALE_FACTOR * fontMetrics().horizontalAdvance( 'X' ) * 23 ); int height = static_cast< int >( width / 1.61803398875 ); // golden ratio - QPixmap pm = QgsSymbolLayerUtils::symbolPreviewPixmap( mPreviewSymbol.get(), QSize( width, height ), height / 20, nullptr, false, nullptr, &mShape ); + QPixmap pm = QgsSymbolLayerUtils::symbolPreviewPixmap( mPreviewSymbol.get(), QSize( width, height ), height / 20, nullptr, false, nullptr, &mShape, screen() ); QByteArray data; QBuffer buffer( &data ); pm.save( &buffer, "PNG", 100 ); - setToolTip( QStringLiteral( "" ).arg( QString( data.toBase64() ) ) ); + setToolTip( QStringLiteral( "" ).arg( QString( data.toBase64() ) ).arg( width ) ); } void QgsLegendPatchShapeButton::setDialogTitle( const QString &title ) diff --git a/src/gui/qgssymbolbutton.cpp b/src/gui/qgssymbolbutton.cpp index 5d988c19b82..fbc9e6b9057 100644 --- a/src/gui/qgssymbolbutton.cpp +++ b/src/gui/qgssymbolbutton.cpp @@ -712,11 +712,11 @@ void QgsSymbolButton::updatePreview( const QColor &color, QgsSymbol *tempSymbol const int width = static_cast< int >( Qgis::UI_SCALE_FACTOR * fontMetrics().horizontalAdvance( 'X' ) * 23 ); const int height = static_cast< int >( width / 1.61803398875 ); // golden ratio - const QPixmap pm = QgsSymbolLayerUtils::symbolPreviewPixmap( previewSymbol.get(), QSize( width, height ), height / 20 ); + const QPixmap pm = QgsSymbolLayerUtils::symbolPreviewPixmap( previewSymbol.get(), QSize( width, height ), height / 20, nullptr, false, nullptr, nullptr, screen() ); QByteArray data; QBuffer buffer( &data ); pm.save( &buffer, "PNG", 100 ); - setToolTip( QStringLiteral( "" ).arg( QString( data.toBase64() ) ) ); + setToolTip( QStringLiteral( "" ).arg( QString( data.toBase64() ) ).arg( width ) ); } bool QgsSymbolButton::colorFromMimeData( const QMimeData *mimeData, QColor &resultColor, bool &hasAlpha ) diff --git a/src/gui/symbology/qgssymbollayerwidget.cpp b/src/gui/symbology/qgssymbollayerwidget.cpp index f73027a4de7..506313d7cc7 100644 --- a/src/gui/symbology/qgssymbollayerwidget.cpp +++ b/src/gui/symbology/qgssymbollayerwidget.cpp @@ -625,7 +625,7 @@ void QgsSimpleLineSymbolLayerWidget::updatePatternIcon() QByteArray data; QBuffer buffer( &data ); pm.save( &buffer, "PNG", 100 ); - mChangePatternButton->setToolTip( QStringLiteral( "" ).arg( QString( data.toBase64() ) ) ); + mChangePatternButton->setToolTip( QStringLiteral( "" ).arg( QString( data.toBase64() ) ).arg( width ) ); } void QgsSimpleLineSymbolLayerWidget::resizeEvent( QResizeEvent *event )