When activating a modal dialog instead of a mainwindow, and the mainwindow

is on all desktops, don't force the modal dialog to be on all desktops too.

svn path=/trunk/kdebase/kwin/; revision=289318
This commit is contained in:
Luboš Luňák 2004-02-19 09:52:51 +00:00
parent df2f09f18e
commit f4ee84d509

View file

@ -308,8 +308,8 @@ void Workspace::requestFocus( Client* c, bool force )
Client* modal = c->findModal();
if( modal != NULL && modal != c )
{
if( !modal->isOnDesktop( c->desktop()))
modal->setDesktop( c->desktop());
if( !modal->isOnDesktop( c->desktop())) // move the modal to client's desktop
modal->setDesktop( c->isOnAllDesktops() ? currentDesktop() : c->desktop());
requestFocus( modal, force );
return;
}