Merge branch 'Plasma/5.15'

This commit is contained in:
Vlad Zagorodniy 2019-04-15 11:20:19 +03:00
commit e3d1ddd2bf
2 changed files with 7 additions and 0 deletions

View file

@ -146,6 +146,12 @@ bool FallApartEffect::isRealWindow(EffectWindow* w)
qCDebug(KWINEFFECTS) << "Splash:" << w->isSplash();
qCDebug(KWINEFFECTS) << "Normal:" << w->isNormalWindow();
*/
if (w->isPopupWindow()) {
return false;
}
if (w->isX11Client() && !w->isManaged()) {
return false;
}
if (!w->isNormalWindow())
return false;
return true;

View file

@ -408,6 +408,7 @@ KWIN_EXPORT int kdemain(int argc, char * argv[])
setenv("QT_QPA_PLATFORM", "xcb", true);
qunsetenv("QT_DEVICE_PIXEL_RATIO");
qunsetenv("QT_SCALE_FACTOR");
QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
KWin::ApplicationX11 a(argc, argv);