┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Uwe Broulik <[email protected]>2017-02-06 19:14:08 +0100
committerKai Uwe Broulik <[email protected]>2017-02-06 19:14:08 +0100
commit4eea1dc5a15f7b8acc3f0f0c2313c7ff2c029b27 (patch)
treefb3ffd157e3dee8a365ac69f2f6cdca0ce6166e9
parent62b7f9228a4dd06c6ece81df3dbfe07b077dcb7e (diff)
parent86d2aa321d54bf3ae6c95476d649634fd0ff68d5 (diff)
Merge branch 'Applications/16.12'
-rw-r--r--src/kitemviews/kstandarditemlistwidget.cpp3
-rw-r--r--src/views/dolphinview.cpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index 8740cb73f..1c89edb6e 100644
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -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;
}
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index bfed3e847..9728e58c3 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -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: