┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurélien Gâteau <[email protected]>2013-04-12 16:31:03 +0200
committerAurélien Gâteau <[email protected]>2013-04-12 16:31:03 +0200
commit1cd7bfb991ef0f5551f47f0344b595447af4f63a (patch)
treed4dd903d8ac15310ec952e498e8911dec2ff980c
parentd8fede7cc6303f530a113f8d72876fae8e1426a0 (diff)
parentbf1b4b488119b35ec4ac5177b1ef89c8b2f1d283 (diff)
Merge remote-tracking branch 'origin/KDE/4.10'
-rw-r--r--src/kitemviews/kstandarditemlistwidget.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index 6adb54633..d36265f56 100644
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -258,21 +258,21 @@ void KStandardItemListWidget::paint(QPainter* painter, const QStyleOptionGraphic
* https://git.reviewboard.kde.org/r/109614/
*/
// Paint pixmap1 so that pixmap1 = m_pixmap * (1.0 - hoverOpacity())
- QPixmap pixmap1(option->rect.size());
+ QPixmap pixmap1(m_pixmap.size());
pixmap1.fill(Qt::transparent);
{
QPainter p(&pixmap1);
p.setOpacity(1.0 - hoverOpacity());
- drawPixmap(&p, m_pixmap);
+ p.drawPixmap(0, 0, m_pixmap);
}
// Paint pixmap2 so that pixmap2 = m_hoverPixmap * hoverOpacity()
- QPixmap pixmap2(option->rect.size());
+ QPixmap pixmap2(pixmap1.size());
pixmap2.fill(Qt::transparent);
{
QPainter p(&pixmap2);
p.setOpacity(hoverOpacity());
- drawPixmap(&p, m_hoverPixmap);
+ p.drawPixmap(0, 0, m_hoverPixmap);
}
// Paint pixmap2 on pixmap1 using CompositionMode_Plus
@@ -285,7 +285,7 @@ void KStandardItemListWidget::paint(QPainter* painter, const QStyleOptionGraphic
}
// Finally paint pixmap1 on the widget
- painter->drawPixmap(0, 0, pixmap1);
+ drawPixmap(painter, pixmap1);
} else {
drawPixmap(painter, m_hoverPixmap);
}