kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.10'

Browse source 
@emmanuel: this merge includes your fix from
https://git.reviewboard.kde.org/r/109488/ . I assume this is not a
problem.

CCMAIL: emmanuelpescosta099@gmail.com
This commit is contained in:
Aurélien Gâteau 2013-03-21 14:12:28 +01:00
parent 5d75c7afc5 e2a89fc2e0
commit 6dfcd7afd9
2 changed files with 43 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/kitemviews/kfileitemmodel.cpp
View file

@ -120,6 +120,11 @@ void KFileItemModel::loadDirectory(const KUrl& url)
void KFileItemModel::refreshDirectory(const KUrl& url)
{
// Refresh all expanded directories first (Bug 295300)
foreach (const KUrl& expandedUrl, m_expandedDirs) {
m_dirLister->openUrl(expandedUrl, KDirLister::Reload);
}
m_dirLister->openUrl(url, KDirLister::Reload);
}

47
src/kitemviews/kstandarditemlistwidget.cpp
View file

@ -249,17 +249,46 @@ void KStandardItemListWidget::paint(QPainter* painter, const QStyleOptionGraphic
const KItemListStyleOption& itemListStyleOption = styleOption();
if (isHovered()) {
const qreal opacity = painter->opacity();
// Blend the unhovered and hovered pixmap if the hovering
// animation is ongoing
if (hoverOpacity() < 1.0) {
painter->setOpacity((1.0 - hoverOpacity()) * opacity);
drawPixmap(painter, m_pixmap);
}
/*
* Linear interpolation between m_pixmap and m_hoverPixmap.
*
* Note that this cannot be achieved by painting m_hoverPixmap over
* m_pixmap, even if the opacities are adjusted. For details see
* https://git.reviewboard.kde.org/r/109614/
*/
// Paint pixmap1 so that pixmap1 = m_pixmap * (1.0 - hoverOpacity())
QPixmap pixmap1(option->rect.size());
pixmap1.fill(Qt::transparent);
{
QPainter p(&pixmap1);
p.setOpacity(1.0 - hoverOpacity());
drawPixmap(&p, m_pixmap);
}
painter->setOpacity(hoverOpacity() * opacity);
drawPixmap(painter, m_hoverPixmap);
painter->setOpacity(opacity);
// Paint pixmap2 so that pixmap2 = m_hoverPixmap * hoverOpacity()
QPixmap pixmap2(option->rect.size());
pixmap2.fill(Qt::transparent);
{
QPainter p(&pixmap2);
p.setOpacity(hoverOpacity());
drawPixmap(&p, m_hoverPixmap);
}
// Paint pixmap2 on pixmap1 using CompositionMode_Plus
// Now pixmap1 = pixmap2 + m_pixmap * (1.0 - hoverOpacity())
// = m_hoverPixmap * hoverOpacity() + m_pixmap * (1.0 - hoverOpacity())
{
QPainter p(&pixmap1);
p.setCompositionMode(QPainter::CompositionMode_Plus);
p.drawPixmap(0, 0, pixmap2);
}
// Finally paint pixmap1 on the widget
painter->drawPixmap(0, 0, pixmap1);
} else {
drawPixmap(painter, m_hoverPixmap);
}
} else {
drawPixmap(painter, m_pixmap);
}