vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'ksplash/ksplash-qml'

icc-effect-5.14.5
Marco Martin 2011-11-03 22:09:35 +01:00
parent d3331eed9c 69ad0fc5fc
commit 6698801cb5
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
composite.cpp
View File

@ -836,7 +836,10 @@ bool Unmanaged::shouldUnredirect() const
{
// the pixmap is needed for the login effect, a nicer solution would be the login effect increasing
// refcount for the window pixmap (which would prevent unredirect), avoiding this hack
if (resourceClass() == "ksplashx" || resourceClass() == "ksplashsimple")
if (resourceClass() == "ksplashx"
|| resourceClass() == "ksplashsimple"
|| resourceClass() == "ksplashqml"
)
return false;
// it must cover whole display or one xinerama screen, and be the topmost there
if (geometry() == workspace()->clientArea(FullArea, geometry().center(), workspace()->currentDesktop())

1
effects/fade/fade.cpp
View File

@ -194,6 +194,7 @@ bool FadeEffect::isFadeWindow(EffectWindow* w)
e = w->data(WindowAddedGrabRole).value<void*>();
if (w->windowClass() == "ksplashx ksplashx"
|| w->windowClass() == "ksplashsimple ksplashsimple"
|| w->windowClass() == "qt-subapplication ksplashqml"
|| (e && e != this)) {
// see login effect
return false;

3
effects/login/login.cpp
View File

@ -111,7 +111,8 @@ bool LoginEffect::isLoginSplash(EffectWindow* w)
// TODO there should be probably a better way (window type?)
// see also fade effect and composite.cpp
if (w->windowClass() == "ksplashx ksplashx"
|| w->windowClass() == "ksplashsimple ksplashsimple") {
|| w->windowClass() == "ksplashsimple ksplashsimple"
|| w->windowClass() == "qt-subapplication ksplashqml") {
return true;
}
return false;