From 40fa49e7b8af6dce20770bd0af873f3ad70789b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Mon, 3 Nov 2008 19:57:05 +0000 Subject: [PATCH] Oversight: When FFM is turned off, don't focus the window under the mouse on mouse up if there was a focus-locked window. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28483 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/Desktop.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp index 261dd9b5d2..88c1cf7bad 100644 --- a/src/servers/app/Desktop.cpp +++ b/src/servers/app/Desktop.cpp @@ -760,7 +760,8 @@ Desktop::SetLastMouseState(const BPoint& position, int32 buttons, if (fLastMouseButtons == 0 && fLockedFocusWindow) { fLockedFocusWindow = NULL; - SetFocusWindow(windowUnderMouse); + if (fSettings->FocusFollowsMouse()) + SetFocusWindow(windowUnderMouse); } }