Don't steal focus from windows using globally active input focus.

svn path=/branches/work/kwin_composite/; revision=612731
This commit is contained in:
Luboš Luňák 2006-12-12 13:40:02 +00:00
parent cdb2302ee5
commit f4b75f439e

View file

@ -1278,18 +1278,11 @@ bool Workspace::setCurrentDesktop( int new_desktop )
if ( c )
requestFocus( c );
else if( !desktops.isEmpty() )
requestFocus( findDesktop( true, currentDesktop()));
else
focusToNull();
if( !desktops.isEmpty() )
{
Window w_tmp;
int i_tmp;
XGetInputFocus( display(), &w_tmp, &i_tmp );
if( w_tmp == null_focus_window ) // CHECKME?
requestFocus( findDesktop( true, currentDesktop()));
}
updateCurrentTopMenu();
// Update focus chain: