yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

checkGroupTransients() uses hasTransient() to break loops, so it must detect them,

Browse source 
fixes #69094

svn path=/trunk/kdebase/kwin/; revision=269892
This commit is contained in:
Luboš Luňák 2003-11-27 14:37:55 +00:00
parent 965a44962e
commit 8f181d8b52
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client.h
View file

@ -332,6 +332,7 @@ class Client : public QObject, public KDecorationDefines
void getWmClientLeader();
void fetchName();
void fetchIconicName();
bool hasTransientInternal( const Client* c, bool indirect, ConstClientList& set ) const;
void updateWorkareaDiffs();
void checkDirection( int new_diff, int old_diff, QRect& rect, const QRect& area );

15
group.cpp
View file

@ -468,6 +468,7 @@ void Client::checkGroupTransients()
// if *it1 and *it2 are both group transients, and are transient for each other,
// make only *it2 transient for *it1 (i.e. subwindow), as *it2 came later,
// and should be therefore on top of *it1
// TODO This could possibly be optimized, it also requires hasTransient() to check for loops.
if( (*it2)->groupTransient() && (*it1)->hasTransient( *it2, true ) && (*it2)->hasTransient( *it1, true ))
(*it2)->transients_list.remove( *it1 );
}
@ -593,13 +594,23 @@ void Client::checkTransient( Window w )
// or recursively the transient_for window
bool Client::hasTransient( const Client* cl, bool indirect ) const
{
// checkGroupTransients() uses this to break loops, so hasTransient() must detect them
ConstClientList set;
return hasTransientInternal( cl, indirect, set );
}
bool Client::hasTransientInternal( const Client* cl, bool indirect, ConstClientList& set ) const
{
if( set.contains( this ))
return false;
set.append( this );
if( cl->transientFor() != NULL )
{
if( cl->transientFor() == this )
return true;
if( !indirect )
return false;
return hasTransient( cl->transientFor(), indirect );
return hasTransientInternal( cl->transientFor(), indirect, set );
}
if( !cl->isTransient())
return false;
@ -613,7 +624,7 @@ bool Client::hasTransient( const Client* cl, bool indirect ) const
for( ClientList::ConstIterator it = transients().begin();
it != transients().end();
++it )
if( (*it)->hasTransient( cl, indirect ))
if( (*it)->hasTransientInternal( cl, indirect, set ))
return true;
return false;
}