Merge branch 'Applications/16.12'

This commit is contained in:
Kai Uwe Broulik 2017-02-06 19:14:08 +01:00
commit 4eea1dc5a1
2 changed files with 4 additions and 1 deletions

View file

@ -852,7 +852,8 @@ void KStandardItemListWidget::hideEvent(QHideEvent* event)
bool KStandardItemListWidget::event(QEvent *event)
{
if (event->type() == QEvent::WindowDeactivate || event->type() == QEvent::WindowActivate) {
if (event->type() == QEvent::WindowDeactivate || event->type() == QEvent::WindowActivate
|| event->type() == QEvent::PaletteChange) {
m_dirtyContent = true;
}

View file

@ -29,6 +29,7 @@
#include <QGraphicsSceneDragDropEvent>
#include <QTimer>
#include <QScrollBar>
#include <QPixmapCache>
#include <QPointer>
#include <QMenu>
#include <QVBoxLayout>
@ -731,6 +732,7 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
switch (event->type()) {
case QEvent::PaletteChange:
updatePalette();
QPixmapCache::clear();
break;
case QEvent::KeyPress: