From aca623bd06b23c9861172329842212b0f589491e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 17 Apr 2006 13:23:45 +0000 Subject: [PATCH] Activating a window with B_AVOID_FOCUS set no longer changes focus - this prevents the desktop window from losing focus when a menu opens. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17151 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/Desktop.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp index 6b721d37aa..d926193b9b 100644 --- a/src/servers/app/Desktop.cpp +++ b/src/servers/app/Desktop.cpp @@ -1223,7 +1223,8 @@ Desktop::ActivateWindow(WindowLayer* window) if (avoidsFront == NULL) { // we're already the frontmost window, we might just not have focus yet - SetFocusWindow(window); + if ((window->Flags() & B_AVOID_FOCUS) == 0) + SetFocusWindow(window); UnlockAllWindows(); return; @@ -1261,7 +1262,8 @@ Desktop::ActivateWindow(WindowLayer* window) } _BringWindowsToFront(windows, kWorkingList, true); - SetFocusWindow(window); + if ((window->Flags() & B_AVOID_FOCUS) == 0) + SetFocusWindow(window); UnlockAllWindows(); }