From c025cb57effc32ac09c85697d9f6f61b87447987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Wed, 9 Mar 2005 15:04:32 +0000 Subject: [PATCH] Redo the fix for #95731 - when a window is manually raised above another window, bring it up to that window's layer only if the layer is ActiveLayer (i.e. fullscreen). BUG: 100762 svn path=/trunk/kdebase/kwin/; revision=396099 --- layers.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/layers.cpp b/layers.cpp index 168be6e98c..0e489e7d67 100644 --- a/layers.cpp +++ b/layers.cpp @@ -483,11 +483,11 @@ ClientList Workspace::constrainedStackingOrder() { Layer l = (*it)->layer(); // If a window is raised above some other window in the same window group - // which is in a higher layer, make sure it stays above that window (see #95731). - if(( l == NormalLayer || l == AboveLayer ) - && !(*it)->isDock() - && minimum_layer.contains( (*it)->group()) - && l < minimum_layer[ (*it)->group() ] ) + // which is in the ActiveLayer (i.e. it's fulscreened), make sure it stays + // above that window (see #95731). + if( minimum_layer.contains( (*it)->group()) + && minimum_layer[ (*it)->group() ] == ActiveLayer + && ( l == NormalLayer || l == AboveLayer )) { l = minimum_layer[ (*it)->group() ]; }