From 92998b409f7f71e6bd0ed1f3a56c3a8503e931bd Mon Sep 17 00:00:00 2001
From: Clemens Zeidler <clemens.zeidler@googlemail.com>
Date: Thu, 2 Dec 2010 22:04:10 +0000
Subject: [PATCH] Take the window when dragging the window and switching the
 workspace using the cmd + F1-12. Thanks Ingo.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39710 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/servers/app/Desktop.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index 04b8d7fe65..934137466c 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -201,8 +201,9 @@ KeyboardFilter::Filter(BMessage* message, EventTarget** _target,
 			{
 				STRACE(("Set Workspace %ld\n", key - 1));
 
-				fDesktop->SetWorkspaceAsync(key - B_F1_KEY,
-					(modifiers & B_SHIFT_KEY) != 0);
+				bool takeWindow = (modifiers & B_SHIFT_KEY) != 0
+					|| fDesktop->MouseEventWindow() != NULL;
+				fDesktop->SetWorkspaceAsync(key - B_F1_KEY, takeWindow);
 				return B_SKIP_MESSAGE;
 			}
 		} if (key == 0x11