mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

Fixed scaling with width or height being 0.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-11-20 16:40:14 +01:00
parent 5052e39cbc
commit 8f28228061
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libtomahawk/utils/ImageRegistry.cpp
View File

@@ -87,7 +87,7 @@ ImageRegistry::pixmap( const QString& image, const QSize& size, TomahawkUtils::I
if ( image.toLower().endsWith( ".svg" ) ) if ( image.toLower().endsWith( ".svg" ) )
{ {
QSvgRenderer svgRenderer( image ); QSvgRenderer svgRenderer( image );
QPixmap p( size.isNull() ? svgRenderer.defaultSize() : size ); QPixmap p( size.isNull() || size.height() == 0 || size.width() == 0 ? svgRenderer.defaultSize() : size );
p.fill( Qt::transparent ); p.fill( Qt::transparent );
QPainter pixPainter( &p ); QPainter pixPainter( &p );
@@ -117,10 +117,16 @@ ImageRegistry::pixmap( const QString& image, const QSize& size, TomahawkUtils::I
if ( !size.isNull() && pixmap.size() != size ) if ( !size.isNull() && pixmap.size() != size )
{ {
Qt::AspectRatioMode aspect = Qt::IgnoreAspectRatio; if ( size.width() == 0 )
if ( size.height() == 0 || size.width() == 0 ) {
aspect = Qt::KeepAspectRatio; pixmap = pixmap.scaledToHeight( size.height(), Qt::SmoothTransformation );
pixmap = pixmap.scaled( size, aspect, Qt::SmoothTransformation ); }
else if ( size.height() == 0 )
{
pixmap = pixmap.scaledToWidth( size.width(), Qt::SmoothTransformation );
}
else
pixmap = pixmap.scaled( size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
} }
putInCache( image, size, mode, opacity, pixmap, tint ); putInCache( image, size, mode, opacity, pixmap, tint );