Forward port rev 1162775:

Include the first desktop window which is on current desktop in tabbox.
This fixes a bug that tabbox switches to a random desktop if there is a desktop window on each virtual desktop.
If there is only one desktop window it is on all virtual desktops and will be used.
If there is one desktop window per virtual desktop only that one will be used.
CCBUG: 247532

svn path=/trunk/KDE/kdebase/workspace/; revision=1162777
This commit is contained in:
Martin Gräßlin 2010-08-12 16:26:29 +00:00
parent 8ca163d06d
commit 787ef1a25f

View file

@ -185,7 +185,7 @@ TabBoxClient* TabBoxHandlerImpl::desktopClient() const
{
foreach( const Client* client, Workspace::self()->stackingOrder() )
{
if( client->isDesktop() )
if( client->isDesktop() && client->isOnCurrentDesktop() )
{
return client->tabBoxClient();
}