mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Merge branch 'Applications/18.12'
This commit is contained in:
commit
d5744305f6
|
@ -709,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 +738,11 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
|
|||
QPixmapCache::clear();
|
||||
break;
|
||||
|
||||
case QEvent::WindowActivate:
|
||||
case QEvent::WindowDeactivate:
|
||||
updatePalette();
|
||||
break;
|
||||
|
||||
case QEvent::KeyPress:
|
||||
if (GeneralSettings::useTabForSwitchingSplitView()) {
|
||||
QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
|
||||
|
|
Loading…
Reference in a new issue