kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix warning on launch "QPixmap::scaled: Pixmap is a null pixmap"

Browse source 
If Dolphin is launched with the information panel on and set to display
previews, PixmapViewer::paintEvent is called three times before any
pixmap is set. Each time the above warning message is output.

REVIEW: 119553
FIXED-IN: 4.14.0
This commit is contained in:
Michael Reeves 2014-08-03 10:48:21 +02:00 committed by Frank Reininghaus
parent 3d076f7c5e
commit a31b836479
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/panels/information/pixmapviewer.cpp
View file

@ -102,11 +102,13 @@ void PixmapViewer::paintEvent(QPaintEvent* event)
const bool useOldPixmap = (m_transition == SizeTransition) &&
(m_oldPixmap.width() > m_pixmap.width());
const QPixmap& largePixmap = useOldPixmap ? m_oldPixmap : m_pixmap;
const QPixmap scaledPixmap = largePixmap.scaled(scaledWidth,
scaledHeight,
Qt::IgnoreAspectRatio,
Qt::FastTransformation);
painter.drawPixmap(x, y, scaledPixmap);
if (!largePixmap.isNull()) {
const QPixmap scaledPixmap = largePixmap.scaled(scaledWidth,
scaledHeight,
Qt::IgnoreAspectRatio,
Qt::FastTransformation);
painter.drawPixmap(x, y, scaledPixmap);
}
} else {
const int x = (width() - m_pixmap.width() ) / 2;
const int y = (height() - m_pixmap.height()) / 2;