Fix Workspace::takeActivity() logic relating to client groups.
BUG: 219894 svn path=/trunk/KDE/kdebase/workspace/; revision=1065960
This commit is contained in:
parent
dfb4e8970a
commit
fc86648f7e
1 changed files with 2 additions and 7 deletions
|
@ -365,15 +365,10 @@ void Workspace::takeActivity( Client* c, int flags, bool handled )
|
||||||
flags &= ~ActivityFocus;
|
flags &= ~ActivityFocus;
|
||||||
handled = false; // no point, can't get clicks
|
handled = false; // no point, can't get clicks
|
||||||
}
|
}
|
||||||
|
if( c->clientGroup() && c->clientGroup()->visible() != c )
|
||||||
|
c->clientGroup()->setVisible( c );
|
||||||
if( !c->isShown( true )) // shouldn't happen, call activateClient() if needed
|
if( !c->isShown( true )) // shouldn't happen, call activateClient() if needed
|
||||||
{
|
{
|
||||||
int group_size = c->clientGroup()->clients().count();
|
|
||||||
if( group_size > 1 && c->clientGroup()->visible() != c ) // the tab is hidden, make it visible and call this function again
|
|
||||||
{
|
|
||||||
c->clientGroup()->setVisible( c );
|
|
||||||
takeActivity( c, flags, handled );
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
kWarning( 1212 ) << "takeActivity: not shown" ;
|
kWarning( 1212 ) << "takeActivity: not shown" ;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue