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

If two windows cannot be on the same desktop then don't allow them to be

Browse source 
grouped.
BUG: 217434

svn path=/trunk/KDE/kdebase/workspace/; revision=1062353
This commit is contained in:
Lucas Murray 2009-12-14 12:29:48 +00:00
parent 017a5c8431
commit a00c06c71a
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
clientgroup.cpp
View file

@ -52,8 +52,12 @@ void ClientGroup::add( Client* c, int before, bool becomeVisible )
if( contains( c ) || !c->workspace()->decorationSupportsClientGrouping() ) if( contains( c ) || !c->workspace()->decorationSupportsClientGrouping() )
return; return;
// Client must not already be grouped // If it's not possible to move both windows on to the same desktop then ungroup them
assert( !c->clientGroup() || c->clientGroup()->clients().size() == 1 ); // We do this here as the ungroup code in updateStates() cannot be called until add() completes
if( c->desktop() != clients_[visible_]->desktop() )
c->setDesktop( clients_[visible_]->desktop() );
if( c->desktop() != clients_[visible_]->desktop() )
return;
// Tabbed windows MUST have a decoration // Tabbed windows MUST have a decoration
if( c->noBorder() ) if( c->noBorder() )
@ -66,8 +70,9 @@ void ClientGroup::add( Client* c, int before, bool becomeVisible )
static_cast<EffectsHandlerImpl*>(effects)->clientGroupItemAdded( static_cast<EffectsHandlerImpl*>(effects)->clientGroupItemAdded(
c->effectWindow(), clients_[visible_]->effectWindow() ); c->effectWindow(), clients_[visible_]->effectWindow() );
// Delete old group and update // Remove from old group and update
delete c->clientGroup(); // Delete old group as it's now empty if( c->clientGroup() )
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
// Actually add to new group // Actually add to new group
@ -236,6 +241,10 @@ void ClientGroup::updateStates( Client* main, Client* only )
(*i)->setKeepAbove( main->keepAbove() ); (*i)->setKeepAbove( main->keepAbove() );
if( (*i)->keepBelow() != main->keepBelow() ) if( (*i)->keepBelow() != main->keepBelow() )
(*i)->setKeepBelow( main->keepBelow() ); (*i)->setKeepBelow( main->keepBelow() );
// If it's not possible to move both windows on to the same desktop then ungroup them
if( (*i)->desktop() != main->desktop() )
remove( *i );
} }
} }

1
workspace.cpp
View file

@ -2874,7 +2874,6 @@ void Workspace::moveItemToClientGroup( ClientGroup* oldGroup, int oldIndex,
ClientGroup* group, int index ) ClientGroup* group, int index )
{ {
Client* c = oldGroup->clients().at( oldIndex ); Client* c = oldGroup->clients().at( oldIndex );
oldGroup->remove( c );
group->add( c, index, true ); group->add( c, index, true );
} }