From f4ee84d50942ddc1ee844bb9a941d9116f142ac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Thu, 19 Feb 2004 09:52:51 +0000
Subject: [PATCH] When activating a modal dialog instead of a mainwindow, and
 the mainwindow is on all desktops, don't force the modal dialog to be on all
 desktops too.

svn path=/trunk/kdebase/kwin/; revision=289318
---
 activation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/activation.cpp b/activation.cpp
index 25471c1dba..f1458744b9 100644
--- a/activation.cpp
+++ b/activation.cpp
@@ -308,8 +308,8 @@ void Workspace::requestFocus( Client* c, bool force )
     Client* modal = c->findModal();
     if( modal != NULL && modal != c )	
         { 
-        if( !modal->isOnDesktop( c->desktop()))
-            modal->setDesktop( c->desktop());
+        if( !modal->isOnDesktop( c->desktop())) // move the modal to client's desktop
+            modal->setDesktop( c->isOnAllDesktops() ? currentDesktop() : c->desktop());
         requestFocus( modal, force );
         return;
         }