From 70e0c099d838115f68857db9999a3536a80e9703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Mon, 30 Apr 2007 11:36:29 +0000
Subject: [PATCH] Merging from old trunk: r625469 | hermier | 2007-01-20
 10:56:57 +0100 (Sat, 20 Jan 2007) | 1 line

#625468 ported to KDE4


svn path=/trunk/KDE/kdebase/workspace/; revision=659525
---
 geometry.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geometry.cpp b/geometry.cpp
index 4fedbd455d..4121c37f50 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -223,7 +223,7 @@ QRect Workspace::clientArea( clientAreaOption opt, const QPoint& p, int desktop
     if( desktop == NETWinInfo::OnAllDesktops || desktop == 0 )
         desktop = currentDesktop();
     QDesktopWidget *desktopwidget = KApplication::desktop();
-    int screen = desktopwidget->screenNumber( p );
+    int screen = desktopwidget->isVirtualDesktop() ? desktopwidget->screenNumber( p ) : desktopwidget->primaryScreen();
     if( screen < 0 )
         screen = desktopwidget->primaryScreen();
     QRect sarea = screenarea // may be NULL during KWin initialization