Author: czeidler Date: 2010-12-02 23:04:10 +0100 (Thu, 02 Dec 2010) New Revision: 39710 Changeset: http://dev.haiku-os.org/changeset/39710 Modified: haiku/trunk/src/servers/app/Desktop.cpp Log: Take the window when dragging the window and switching the workspace using the cmd + F1-12. Thanks Ingo. Modified: haiku/trunk/src/servers/app/Desktop.cpp =================================================================== --- haiku/trunk/src/servers/app/Desktop.cpp 2010-12-02 22:01:41 UTC (rev 39709) +++ haiku/trunk/src/servers/app/Desktop.cpp 2010-12-02 22:04:10 UTC (rev 39710) @@ -201,8 +201,9 @@ { 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