From 842aad23f97a6f4ac6353529eaee2c57420a0a7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 18 Nov 2009 11:40:33 +0000 Subject: [PATCH] * Fixed focus behaviour of FFM on workspace switch - let SetFocusWindow() decide which window to give focus, it already does the right thing. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34110 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/Desktop.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp index 5b1809a94f..c4f6c2f920 100644 --- a/src/servers/app/Desktop.cpp +++ b/src/servers/app/Desktop.cpp @@ -3236,11 +3236,10 @@ Desktop::_SetWorkspace(int32 index) delete region; } - // Set new focus to the front window, but keep focus to a floating - // window if still visible + // Set new focus, but keep focus to a floating window if still visible if (!_Windows(index).HasWindow(FocusWindow()) || !FocusWindow()->IsFloating()) - SetFocusWindow(FrontWindow()); + SetFocusWindow(); _WindowChanged(NULL); MarkDirty(dirty);