Temporarily comment out Q_ASSERT's about stacking order, as they're quite

harmless, but everybody blames them in their bugreports.

svn path=/trunk/kdebase/kwin/; revision=268335
This commit is contained in:
Luboš Luňák 2003-11-20 09:05:32 +00:00
parent d6721e0b7a
commit b3c1af874a
2 changed files with 4 additions and 4 deletions

View file

@ -202,7 +202,7 @@ void Workspace::propagateClients( bool propagate_new_clients )
// TODO misleading name for this method // TODO misleading name for this method
Client* Workspace::topClientOnDesktop( int desktop ) const Client* Workspace::topClientOnDesktop( int desktop ) const
{ {
Q_ASSERT( block_stacking_updates == 0 ); // TODO Q_ASSERT( block_stacking_updates == 0 );
for ( ClientList::ConstIterator it = stacking_order.fromLast(); it != stacking_order.end(); --it) for ( ClientList::ConstIterator it = stacking_order.fromLast(); it != stacking_order.end(); --it)
{ {
if ( (*it)->isOnDesktop( desktop ) && !(*it)->isSpecialWindow() if ( (*it)->isOnDesktop( desktop ) && !(*it)->isSpecialWindow()
@ -240,7 +240,7 @@ void Workspace::raiseOrLowerClient( Client *c)
{ {
if (!c) return; if (!c) return;
Client* topmost = NULL; Client* topmost = NULL;
Q_ASSERT( block_stacking_updates == 0 ); // TODO Q_ASSERT( block_stacking_updates == 0 );
if ( most_recently_raised && stacking_order.contains( most_recently_raised ) && if ( most_recently_raised && stacking_order.contains( most_recently_raised ) &&
most_recently_raised->isShown( true ) && c->isOnCurrentDesktop()) most_recently_raised->isShown( true ) && c->isOnCurrentDesktop())
topmost = most_recently_raised; topmost = most_recently_raised;
@ -546,7 +546,7 @@ void Workspace::blockStackingUpdates( bool block )
// Ensure list is in stacking order // Ensure list is in stacking order
ClientList Workspace::ensureStackingOrder( const ClientList& list ) const ClientList Workspace::ensureStackingOrder( const ClientList& list ) const
{ {
Q_ASSERT( block_stacking_updates == 0 ); // TODO Q_ASSERT( block_stacking_updates == 0 );
if( list.count() < 2 ) if( list.count() < 2 )
return list; return list;
// TODO is this worth optimizing? // TODO is this worth optimizing?

View file

@ -949,7 +949,7 @@ bool Workspace::setCurrentDesktop( int new_desktop )
if( popup ) if( popup )
popup->close(); popup->close();
block_focus = TRUE; block_focus = TRUE;
Q_ASSERT( block_stacking_updates == 0 ); // make sure stacking_order is up to date // TODO Q_ASSERT( block_stacking_updates == 0 ); // make sure stacking_order is up to date
StackingUpdatesBlocker blocker( this ); StackingUpdatesBlocker blocker( this );
if (new_desktop != current_desktop) if (new_desktop != current_desktop)