]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'Applications/18.12'
authorKai Uwe Broulik <kde@privat.broulik.de>
Fri, 8 Feb 2019 08:02:00 +0000 (09:02 +0100)
committerKai Uwe Broulik <kde@privat.broulik.de>
Fri, 8 Feb 2019 08:02:00 +0000 (09:02 +0100)
1  2 
src/views/dolphinview.cpp

index 7eb4d24546ecf69140a12fa7b6a74958fb8262f6,b8c2f3d012d23f6c1d293e948c2d73b760d518cd..1374af24811c5453c70be13e8fd82395bc1ede0d
@@@ -639,7 -639,9 +639,7 @@@ void DolphinView::renameSelectedItems(
          RenameDialog* dialog = new RenameDialog(this, items);
          connect(dialog, &RenameDialog::renamingFinished, this, &DolphinView::slotRenameDialogRenamingFinished);
  
 -        dialog->show();
 -        dialog->raise();
 -        dialog->activateWindow();
 +        dialog->open();
      }
  
      // Assure that the current index remains visible when KFileItemModel
@@@ -709,7 -711,7 +709,7 @@@ void DolphinView::stopLoading(
  
  void DolphinView::updatePalette()
  {
-     QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
+     QColor color = KColorScheme(isActiveWindow() ? QPalette::Active : QPalette::Inactive, KColorScheme::View).background().color();
      if (!m_active) {
          color.setAlpha(150);
      }
@@@ -738,6 -740,11 +738,11 @@@ bool DolphinView::eventFilter(QObject* 
          QPixmapCache::clear();
          break;
  
+     case QEvent::WindowActivate:
+     case QEvent::WindowDeactivate:
+         updatePalette();
+         break;
      case QEvent::KeyPress:
          if (GeneralSettings::useTabForSwitchingSplitView()) {
              QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);