feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner.ItemLibrary: to not scale null pixmaps

Browse Source 
Change-Id: I23c22f3b0f383158814e105058e827e8703fb336
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Thomas Hartmann
2013-10-31 14:22:35 +01:00
parent 67402b35bf
commit 639a04ac09
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp
View File

@@ -44,6 +44,10 @@ QPixmap ItemLibraryImageProvider::requestPixmap(const QString &id, QSize *size,
size->setWidth(pixmap.width()); size->setWidth(pixmap.width());
size->setHeight(pixmap.height()); size->setHeight(pixmap.height());
} }
if (pixmap.isNull())
return pixmap;
if (requestedSize.isValid()) if (requestedSize.isValid())
return pixmap.scaled(requestedSize); return pixmap.scaled(requestedSize);
return pixmap; return pixmap;

3
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
View File

@@ -412,6 +412,9 @@ QIcon ItemLibraryFileIconProvider::icon(const QFileInfo &info) const
pixmap = defaultIcon.pixmap(defaultIcon.actualSize(m_iconSize)); pixmap = defaultIcon.pixmap(defaultIcon.actualSize(m_iconSize));
} }
if (pixmap.isNull())
return pixmap;
if (pixmap.width() == m_iconSize.width() if (pixmap.width() == m_iconSize.width()
&& pixmap.height() == m_iconSize.height()) && pixmap.height() == m_iconSize.height())
return pixmap; return pixmap;