mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 11:25:14 +00:00
Merge remote-tracking branch 'origin/KDE/4.10'
This commit is contained in:
commit
1cd7bfb991
|
@ -258,21 +258,21 @@ void KStandardItemListWidget::paint(QPainter* painter, const QStyleOptionGraphic
|
||||||
* https://git.reviewboard.kde.org/r/109614/
|
* https://git.reviewboard.kde.org/r/109614/
|
||||||
*/
|
*/
|
||||||
// Paint pixmap1 so that pixmap1 = m_pixmap * (1.0 - hoverOpacity())
|
// Paint pixmap1 so that pixmap1 = m_pixmap * (1.0 - hoverOpacity())
|
||||||
QPixmap pixmap1(option->rect.size());
|
QPixmap pixmap1(m_pixmap.size());
|
||||||
pixmap1.fill(Qt::transparent);
|
pixmap1.fill(Qt::transparent);
|
||||||
{
|
{
|
||||||
QPainter p(&pixmap1);
|
QPainter p(&pixmap1);
|
||||||
p.setOpacity(1.0 - hoverOpacity());
|
p.setOpacity(1.0 - hoverOpacity());
|
||||||
drawPixmap(&p, m_pixmap);
|
p.drawPixmap(0, 0, m_pixmap);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Paint pixmap2 so that pixmap2 = m_hoverPixmap * hoverOpacity()
|
// Paint pixmap2 so that pixmap2 = m_hoverPixmap * hoverOpacity()
|
||||||
QPixmap pixmap2(option->rect.size());
|
QPixmap pixmap2(pixmap1.size());
|
||||||
pixmap2.fill(Qt::transparent);
|
pixmap2.fill(Qt::transparent);
|
||||||
{
|
{
|
||||||
QPainter p(&pixmap2);
|
QPainter p(&pixmap2);
|
||||||
p.setOpacity(hoverOpacity());
|
p.setOpacity(hoverOpacity());
|
||||||
drawPixmap(&p, m_hoverPixmap);
|
p.drawPixmap(0, 0, m_hoverPixmap);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Paint pixmap2 on pixmap1 using CompositionMode_Plus
|
// Paint pixmap2 on pixmap1 using CompositionMode_Plus
|
||||||
|
@ -285,7 +285,7 @@ void KStandardItemListWidget::paint(QPainter* painter, const QStyleOptionGraphic
|
||||||
}
|
}
|
||||||
|
|
||||||
// Finally paint pixmap1 on the widget
|
// Finally paint pixmap1 on the widget
|
||||||
painter->drawPixmap(0, 0, pixmap1);
|
drawPixmap(painter, pixmap1);
|
||||||
} else {
|
} else {
|
||||||
drawPixmap(painter, m_hoverPixmap);
|
drawPixmap(painter, m_hoverPixmap);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue