yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'kwintransient'

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1179964
This commit is contained in:
Chani Armitage 2010-09-26 16:44:07 +00:00
parent 4687f17759
commit 5c61b850cf
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
manage.cpp
View file

@ -173,7 +173,6 @@ bool Client::manage( Window w, bool isMapped )
// If this window is transient, ensure that it is opened on the // If this window is transient, ensure that it is opened on the
// same window as its parent. this is necessary when an application // same window as its parent. this is necessary when an application
// starts up on a different desktop than is currently displayed // starts up on a different desktop than is currently displayed
//FIXME do the same for activities too
if( isTransient() ) if( isTransient() )
{ {
ClientList mainclients = mainClients(); ClientList mainclients = mainClients();
@ -199,6 +198,9 @@ bool Client::manage( Window w, bool isMapped )
desk = workspace()->currentDesktop(); desk = workspace()->currentDesktop();
else if( maincl != NULL ) else if( maincl != NULL )
desk = maincl->desktop(); desk = maincl->desktop();
if ( maincl )
setOnActivities(maincl->activities());
} }
if( info->desktop() ) if( info->desktop() )
desk = info->desktop(); // Window had the initial desktop property, force it desk = info->desktop(); // Window had the initial desktop property, force it