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

Reoder how the initial virtual desktop placement is considered.

Browse source 
For dialogs prefer placing together with mainwindow to data
from startup notification (happens with kio_uiserver dialogs).

svn path=/trunk/kdebase/kwin/; revision=360448
This commit is contained in:
Luboš Luňák 2004-11-04 18:32:30 +00:00
parent 8255bc2749
commit a6fa4609c2
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
manage.cpp
View file

@ -137,17 +137,13 @@ bool Client::manage( Window w, bool isMapped )
setUserNoBorder( true ); setUserNoBorder( true );
// initial desktop placement // initial desktop placement
if ( info->desktop() )
desk = info->desktop(); // window had the initial desktop property!
else if( asn_valid && asn_data.desktop() != 0 )
desk = asn_data.desktop();
if ( session ) if ( session )
{ {
desk = session->desktop; desk = session->desktop;
if( session->onAllDesktops ) if( session->onAllDesktops )
desk = NET::OnAllDesktops; desk = NET::OnAllDesktops;
} }
else if ( desk == 0 ) else
{ {
// 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
@ -173,6 +169,10 @@ bool Client::manage( Window w, bool isMapped )
else if( maincl != NULL ) else if( maincl != NULL )
desk = maincl->desktop(); desk = maincl->desktop();
} }
if ( info->desktop() )
desk = info->desktop(); // window had the initial desktop property, force it
if( desktop() == 0 && asn_valid && asn_data.desktop() != 0 )
desk = asn_data.desktop();
} }
if ( desk == 0 ) // assume window wants to be visible on the current desktop if ( desk == 0 ) // assume window wants to be visible on the current desktop
desk = workspace()->currentDesktop(); desk = workspace()->currentDesktop();