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
This commit is contained in:
Luboš Luňák 2005-03-09 15:04:32 +00:00
parent ec5d466c69
commit c025cb57ef

View file

@ -483,11 +483,11 @@ ClientList Workspace::constrainedStackingOrder()
{ {
Layer l = (*it)->layer(); Layer l = (*it)->layer();
// If a window is raised above some other window in the same window group // 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). // which is in the ActiveLayer (i.e. it's fulscreened), make sure it stays
if(( l == NormalLayer || l == AboveLayer ) // above that window (see #95731).
&& !(*it)->isDock() if( minimum_layer.contains( (*it)->group())
&& minimum_layer.contains( (*it)->group()) && minimum_layer[ (*it)->group() ] == ActiveLayer
&& l < minimum_layer[ (*it)->group() ] ) && ( l == NormalLayer || l == AboveLayer ))
{ {
l = minimum_layer[ (*it)->group() ]; l = minimum_layer[ (*it)->group() ];
} }