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

When moving a window between groups don't change the geometry of all

Browse source 
other windows in the old group. Was a regression of the client group
geometry and desktop check commits.

svn path=/trunk/KDE/kdebase/workspace/; revision=1063777
This commit is contained in:
Lucas Murray 2009-12-19 10:13:43 +00:00
parent 24f6bec610
commit fc4d3fe974
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
clientgroup.cpp
View file

@ -52,19 +52,35 @@ void ClientGroup::add( Client* c, int before, bool becomeVisible )
if( contains( c ) || !c->workspace()->decorationSupportsClientGrouping() ) if( contains( c ) || !c->workspace()->decorationSupportsClientGrouping() )
return; return;
// Remove the Client->ClientGroup reference if the client is already in another group so we
// don't change the geometry of other clients in their current group by accident. However
// don't REMOVE them from the actual group until we are certain that the client will be moved.
ClientGroup* oldGroup = NULL;
if( c->clientGroup() )
{
oldGroup = c->clientGroup();
c->setClientGroup( NULL );
}
// If it's not possible to have the same states then ungroup them, TODO: Check all states // If it's not possible to have the same states then ungroup them, TODO: Check all states
// We do this here as the ungroup code in updateStates() cannot be called until add() completes // We do this here as the ungroup code in updateStates() cannot be called until add() completes
QRect oldGeom = c->geometry(); QRect oldGeom = c->geometry();
if( c->geometry() != clients_[visible_]->geometry() ) if( c->geometry() != clients_[visible_]->geometry() )
c->setGeometry( clients_[visible_]->geometry() ); c->setGeometry( clients_[visible_]->geometry() );
if( c->geometry() != clients_[visible_]->geometry() ) if( c->geometry() != clients_[visible_]->geometry() )
{
if( oldGroup ) // Re-add to old group if required
c->setClientGroup( oldGroup );
return; return;
}
if( c->desktop() != clients_[visible_]->desktop() ) if( c->desktop() != clients_[visible_]->desktop() )
c->setDesktop( clients_[visible_]->desktop() ); c->setDesktop( clients_[visible_]->desktop() );
if( c->desktop() != clients_[visible_]->desktop() ) if( c->desktop() != clients_[visible_]->desktop() )
{ {
if( c->geometry() != oldGeom ) if( c->geometry() != oldGeom )
c->setGeometry( oldGeom ); // Restore old geometry c->setGeometry( oldGeom ); // Restore old geometry
if( oldGroup ) // Re-add to old group if required
c->setClientGroup( oldGroup );
return; return;
} }
@ -74,12 +90,16 @@ void ClientGroup::add( Client* c, int before, bool becomeVisible )
if( clients_[visible_]->noBorder() ) if( clients_[visible_]->noBorder() )
clients_[visible_]->setNoBorder( false ); clients_[visible_]->setNoBorder( false );
// Re-add to old group if required for the effect hook
if( oldGroup )
c->setClientGroup( oldGroup );
// Notify effects of merge // Notify effects of merge
if( effects != NULL ) if( effects != NULL )
static_cast<EffectsHandlerImpl*>(effects)->clientGroupItemAdded( static_cast<EffectsHandlerImpl*>(effects)->clientGroupItemAdded(
c->effectWindow(), clients_[visible_]->effectWindow() ); c->effectWindow(), clients_[visible_]->effectWindow() );
// Remove from old group and update // Actually remove from old group if required and update
if( c->clientGroup() ) if( c->clientGroup() )
c->clientGroup()->remove( c ); c->clientGroup()->remove( c );
c->setClientGroup( this ); // Let the client know which group it belongs to c->setClientGroup( this ); // Let the client know which group it belongs to