[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kwin
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2004-11-04 18:32:31
Message-ID: 20041104183231.32DA416BF2 () office ! kde ! org
[Download RAW message or body]

CVS commit by lunakl: 

Reoder how the initial virtual desktop placement is considered.
For dialogs prefer placing together with mainwindow to data
from startup notification (happens with kio_uiserver dialogs).


  M +5 -5      manage.cpp   2.63


--- kdebase/kwin/manage.cpp  #2.62:2.63
@@ -138,8 +138,4 @@ bool Client::manage( Window w, bool isMa
 
     // 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 ) 
         {
@@ -148,5 +144,5 @@ bool Client::manage( Window w, bool isMa
             desk = NET::OnAllDesktops;
         }
-    else if ( desk == 0 ) 
+    else
         {
         // if this window is transient, ensure that it is opened on the
@@ -174,4 +170,8 @@ bool Client::manage( Window w, bool isMa
                 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


[prev in list] [next in list] [prev in thread] [next in thread]