vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure that when calling Workspace::clientHidden(), the client is really 

hidden, otherwise it could attempt to restore the focus back to this client.
CCMAIL: 66926-done@bugs.kde.org

svn path=/trunk/kdebase/kwin/; revision=263383
icc-effect-5.14.5
Luboš Luňák 2003-10-31 09:45:14 +00:00
parent f7a59dfd24
commit b878ad84d9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
activation.cpp
View File

@ -343,6 +343,7 @@ extern bool block_focus; // SELI
void Workspace::clientHidden( Client* c )
{
assert( !c->isShown( true ) || !c->isOnCurrentDesktop());
if( !( c == active_client
|| ( should_get_focus.count() > 0 && c == should_get_focus.last())))
return;
@ -378,13 +379,10 @@ void Workspace::clientHidden( Client* c )
if( get_focus == NULL )
get_focus = *it;
}
if( get_focus == NULL )
get_focus = findDesktop( true, currentDesktop());
if( get_focus != NULL )
{
requestFocus( get_focus );
return;
}
if ( !desktops.isEmpty() )
requestFocus( findDesktop( true, currentDesktop()));
else
focusToNull();
}

2
client.cpp
View File

@ -172,6 +172,7 @@ void Client::releaseWindow( bool on_shutdown )
if (moveResizeMode)
leaveMoveResize();
setModal( false ); // otherwise its mainwindow wouldn't get focus
hidden = true; // so that it's not considered visible anymore
if( !on_shutdown )
workspace()->clientHidden( this );
destroyDecoration();
@ -212,6 +213,7 @@ void Client::destroyClient()
leaveMoveResize();
++block_geometry;
setModal( false );
hidden = true; // so that it's not considered visible anymore
workspace()->clientHidden( this );
destroyDecoration();
cleanGrouping();