]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'Applications/16.12'
authorKai Uwe Broulik <kde@privat.broulik.de>
Mon, 6 Feb 2017 18:14:08 +0000 (19:14 +0100)
committerKai Uwe Broulik <kde@privat.broulik.de>
Mon, 6 Feb 2017 18:14:08 +0000 (19:14 +0100)
1  2 
src/views/dolphinview.cpp

index bfed3e84760e49df113a039b2dbb9cd3a452097f,30298d2e1efe356d50f62a09d8f2db8e063920ea..9728e58c3e47b86a57232dc2fa20d4083b365caf
@@@ -29,6 -29,7 +29,7 @@@
  #include <QGraphicsSceneDragDropEvent>
  #include <QTimer>
  #include <QScrollBar>
+ #include <QPixmapCache>
  #include <QPointer>
  #include <QMenu>
  #include <QVBoxLayout>
@@@ -731,6 -732,7 +732,7 @@@ bool DolphinView::eventFilter(QObject* 
      switch (event->type()) {
      case QEvent::PaletteChange:
          updatePalette();
+         QPixmapCache::clear();
          break;
  
      case QEvent::KeyPress:
@@@ -1021,7 -1023,7 +1023,7 @@@ void DolphinView::slotItemHovered(int i
          const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint());
          itemRect.moveTo(pos);
  
 -        m_toolTipManager->showToolTip(item, itemRect);
 +        m_toolTipManager->showToolTip(item, itemRect, nativeParentWidget()->windowHandle());
      }
  
      emit requestItemInfo(item);
@@@ -1534,7 -1536,7 +1536,7 @@@ void DolphinView::slotRoleEditingFinish
              KIO::Job * job = KIO::moveAs(oldUrl, newUrl);
              KJobWidgets::setWindow(job, this);
              KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, {oldUrl}, newUrl, job);
 -            job->ui()->setAutoErrorHandlingEnabled(true);
 +            job->uiDelegate()->setAutoErrorHandlingEnabled(true);
  
              if (!newNameExistsAlready) {
                  // Only connect the result signal if there is no item with the new name